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 /ipack-convert-bus-code-to-use-dev_groups.patch | |
| parent | ad2f0a874ca11c77885ea119cc80fe40c7e29eb3 (diff) | |
| download | patches-52894f7f35f3c6ad2b3362f021cdee69797d7a79.tar.gz | |
renames and a new patch
Diffstat (limited to 'ipack-convert-bus-code-to-use-dev_groups.patch')
| -rw-r--r-- | ipack-convert-bus-code-to-use-dev_groups.patch | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/ipack-convert-bus-code-to-use-dev_groups.patch b/ipack-convert-bus-code-to-use-dev_groups.patch new file mode 100644 index 00000000000000..f0864cf6b0a888 --- /dev/null +++ b/ipack-convert-bus-code-to-use-dev_groups.patch @@ -0,0 +1,62 @@ +From foo@baz Sun Oct 6 13:29:07 PDT 2013 +Date: Sun, 06 Oct 2013 13:29:07 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: ipack: 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 ipack bus code to use the +correct field. + +Cc: Samuel Iglesias Gonsalvez <siglesias@igalia.com> +Cc: Jens Taprogge <jens.taprogge@taprogge.org> +Cc: <industrypack-devel@lists.sourceforge.net> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +--- + +Samuel and Jens, I can take this through my driver-core tree if you +don't want to take it through yours, just let me know what works best +for you. + + 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, + }; + |