diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-03 16:05:34 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-03 16:05:34 -0800 |
| commit | 52894f7f35f3c6ad2b3362f021cdee69797d7a79 (patch) | |
| tree | 798f5b8bfb2a5b23e49fb68002f660b694c4e672 /tifm-convert-bus-code-to-use-dev_groups.patch | |
| parent | ad2f0a874ca11c77885ea119cc80fe40c7e29eb3 (diff) | |
| download | patches-52894f7f35f3c6ad2b3362f021cdee69797d7a79.tar.gz | |
renames and a new patch
Diffstat (limited to 'tifm-convert-bus-code-to-use-dev_groups.patch')
| -rw-r--r-- | tifm-convert-bus-code-to-use-dev_groups.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/tifm-convert-bus-code-to-use-dev_groups.patch b/tifm-convert-bus-code-to-use-dev_groups.patch new file mode 100644 index 00000000000000..b8cf0af7f089dc --- /dev/null +++ b/tifm-convert-bus-code-to-use-dev_groups.patch @@ -0,0 +1,41 @@ +From foo@baz Mon Oct 7 18:13:26 PDT 2013 +Date: Mon, 07 Oct 2013 18:13:26 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: tifm: 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 tifm bus code to use the +correct field. + +Cc: Alex Dubov <oakad@yahoo.com> +Cc: Arnd Bergmann <arnd@arndb.de> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + drivers/misc/tifm_core.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +--- a/drivers/misc/tifm_core.c ++++ b/drivers/misc/tifm_core.c +@@ -145,15 +145,17 @@ static ssize_t type_show(struct device * + struct tifm_dev *sock = container_of(dev, struct tifm_dev, dev); + return sprintf(buf, "%x", sock->type); + } ++static DEVICE_ATTR_RO(type); + +-static struct device_attribute tifm_dev_attrs[] = { +- __ATTR(type, S_IRUGO, type_show, NULL), +- __ATTR_NULL ++static struct attribute *tifm_dev_attrs[] = { ++ &dev_attr_type.attr, ++ NULL, + }; ++ATTRIBUTE_GROUPS(tifm_dev); + + static struct bus_type tifm_bus_type = { + .name = "tifm", +- .dev_attrs = tifm_dev_attrs, ++ .dev_groups = tifm_dev_groups, + .match = tifm_bus_match, + .uevent = tifm_uevent, + .probe = tifm_device_probe, |