diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-05 17:33:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-05 17:33:03 -0700 |
| commit | e1adefb1daf4ccaa49432aa8ed5db2abe2abb0aa (patch) | |
| tree | e6ca55bb172383b609d6065f21b2dbc4fb681d6e /p05.patch | |
| parent | 1d0da63c6781741b6e9cc9558b13918c09445903 (diff) | |
| download | patches-e1adefb1daf4ccaa49432aa8ed5db2abe2abb0aa.tar.gz | |
more patches
Diffstat (limited to 'p05.patch')
| -rw-r--r-- | p05.patch | 42 |
1 files changed, 42 insertions, 0 deletions
diff --git a/p05.patch b/p05.patch new file mode 100644 index 00000000000000..a7760fe0fedc28 --- /dev/null +++ b/p05.patch @@ -0,0 +1,42 @@ +--- + drivers/uwb/umc-bus.c | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +--- a/drivers/uwb/umc-bus.c ++++ b/drivers/uwb/umc-bus.c +@@ -201,6 +201,7 @@ static ssize_t capability_id_show(struct + + return sprintf(buf, "0x%02x\n", umc->cap_id); + } ++static DEVICE_ATTR_RO(capability_id); + + static ssize_t version_show(struct device *dev, struct device_attribute *attr, char *buf) + { +@@ -208,12 +209,14 @@ static ssize_t version_show(struct devic + + return sprintf(buf, "0x%04x\n", umc->version); + } ++static DEVICE_ATTR_RO(version); + +-static struct device_attribute umc_dev_attrs[] = { +- __ATTR_RO(capability_id), +- __ATTR_RO(version), +- __ATTR_NULL, ++static struct attribute *umc_dev_attrs[] = { ++ &dev_attr_capability_id.attr, ++ &dev_attr_version.attr, ++ NULL, + }; ++ATTRIBUTE_GROUPS(umc_dev); + + struct bus_type umc_bus_type = { + .name = "umc", +@@ -222,7 +225,7 @@ struct bus_type umc_bus_type = { + .remove = umc_device_remove, + .suspend = umc_device_suspend, + .resume = umc_device_resume, +- .dev_attrs = umc_dev_attrs, ++ .dev_groups = umc_dev_groups, + }; + EXPORT_SYMBOL_GPL(umc_bus_type); + |