diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-04 17:26:39 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-04 17:26:39 -0700 |
| commit | 1d0da63c6781741b6e9cc9558b13918c09445903 (patch) | |
| tree | 069426fd313f3a6758c1ece7c74e63530796d481 /i02.patch | |
| parent | f2a4447ad2255b39ebc3de81bf020ea667fdf983 (diff) | |
| download | patches-1d0da63c6781741b6e9cc9558b13918c09445903.tar.gz | |
more patches added to clean up dev_attrs
Diffstat (limited to 'i02.patch')
| -rw-r--r-- | i02.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/i02.patch b/i02.patch new file mode 100644 index 00000000000000..bf333e9fbea1a7 --- /dev/null +++ b/i02.patch @@ -0,0 +1,42 @@ +--- + drivers/ipack/ipack.c | 22 +++++++++++++++------- + 1 file changed, 15 insertions(+), 7 deletions(-) + +--- a/drivers/ipack/ipack.c ++++ b/drivers/ipack/ipack.c +@@ -180,20 +180,28 @@ static ssize_t modalias_show(struct devi + + ipack_device_attr(id_format, "0x%hhu\n"); + +-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), ++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, + }; ++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_attrs = ipack_dev_attrs, ++ .dev_groups = ipack_groups, + .uevent = ipack_uevent, + }; + |