diff options
Diffstat (limited to 'uwb-convert-bus-code-to-use-dev_groups.patch')
| -rw-r--r-- | uwb-convert-bus-code-to-use-dev_groups.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/uwb-convert-bus-code-to-use-dev_groups.patch b/uwb-convert-bus-code-to-use-dev_groups.patch new file mode 100644 index 00000000000000..362f00870ae6df --- /dev/null +++ b/uwb-convert-bus-code-to-use-dev_groups.patch @@ -0,0 +1,55 @@ +From foo@baz Sun Oct 6 13:37:35 PDT 2013 +Date: Sun, 06 Oct 2013 13:37:35 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: uwb: convert bus code to use dev_groups + +The dev_attrs field of struct bus_type is going away soon, dev_groups +should be used instead. This converts the uwb bus code to use the +correct field. + +Cc: Bruno Morelli <bruno@evidence.eu.com> +Cc: <linux-usb@vger.kernel.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + 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); + |