summaryrefslogtreecommitdiff
path: root/drivers/ipack
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/ipack')
-rw-r--r--drivers/ipack/ipack.c22
1 files changed, 7 insertions, 15 deletions
diff --git a/drivers/ipack/ipack.c b/drivers/ipack/ipack.c
index d0016ba..6e066c5 100644
--- a/drivers/ipack/ipack.c
+++ b/drivers/ipack/ipack.c
@@ -180,28 +180,20 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
ipack_device_attr(id_format, "0x%hhu\n");
-static DEVICE_ATTR_RO(id);
-static DEVICE_ATTR_RO(id_device);
-static DEVICE_ATTR_RO(id_format);
-static DEVICE_ATTR_RO(id_vendor);
-static DEVICE_ATTR_RO(modalias);
-
-static struct attribute *ipack_attrs[] = {
- &dev_attr_id.attr,
- &dev_attr_id_device.attr,
- &dev_attr_id_format.attr,
- &dev_attr_id_vendor.attr,
- &dev_attr_modalias.attr,
- NULL,
+static struct device_attribute ipack_dev_attrs[] = {
+ __ATTR_RO(id),
+ __ATTR_RO(id_device),
+ __ATTR_RO(id_format),
+ __ATTR_RO(id_vendor),
+ __ATTR_RO(modalias),
};
-ATTRIBUTE_GROUPS(ipack);
static struct bus_type ipack_bus_type = {
.name = "ipack",
.probe = ipack_bus_probe,
.match = ipack_bus_match,
.remove = ipack_bus_remove,
- .dev_groups = ipack_groups,
+ .dev_attrs = ipack_dev_attrs,
.uevent = ipack_uevent,
};