diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-13 16:31:36 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-11-13 16:31:36 +0900 |
| commit | 7fa8fb124d5339a4e0d20d0a97a6b63731ce97d3 (patch) | |
| tree | 5761a78996b2f07f160c7a1e91b3a0f387272c4c /memstick-convert-bus-code-to-use-dev_groups.patch | |
| parent | 52894f7f35f3c6ad2b3362f021cdee69797d7a79 (diff) | |
| download | patches-7fa8fb124d5339a4e0d20d0a97a6b63731ce97d3.tar.gz | |
remove patches upstream now
Diffstat (limited to 'memstick-convert-bus-code-to-use-dev_groups.patch')
| -rw-r--r-- | memstick-convert-bus-code-to-use-dev_groups.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/memstick-convert-bus-code-to-use-dev_groups.patch b/memstick-convert-bus-code-to-use-dev_groups.patch deleted file mode 100644 index 6d5b1b0d2f3a9b..00000000000000 --- a/memstick-convert-bus-code-to-use-dev_groups.patch +++ /dev/null @@ -1,52 +0,0 @@ -From foo@baz Mon Oct 7 18:14:24 PDT 2013 -Date: Mon, 07 Oct 2013 18:14:24 -0700 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: memstick: 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 memstick bus code to use the -correct field. - -Cc: Andrew Morton <akpm@linux-foundation.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/memstick/core/memstick.c | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - ---- a/drivers/memstick/core/memstick.c -+++ b/drivers/memstick/core/memstick.c -@@ -153,24 +153,24 @@ static ssize_t name##_show(struct device - struct memstick_dev *card = container_of(dev, struct memstick_dev, \ - dev); \ - return sprintf(buf, format, card->id.name); \ --} -+} \ -+static DEVICE_ATTR_RO(name); - - MEMSTICK_ATTR(type, "%02X"); - MEMSTICK_ATTR(category, "%02X"); - MEMSTICK_ATTR(class, "%02X"); - --#define MEMSTICK_ATTR_RO(name) __ATTR(name, S_IRUGO, name##_show, NULL) -- --static struct device_attribute memstick_dev_attrs[] = { -- MEMSTICK_ATTR_RO(type), -- MEMSTICK_ATTR_RO(category), -- MEMSTICK_ATTR_RO(class), -- __ATTR_NULL -+static struct attribute *memstick_dev_attrs[] = { -+ &dev_attr_type.attr, -+ &dev_attr_category.attr, -+ &dev_attr_class.attr, -+ NULL, - }; -+ATTRIBUTE_GROUPS(memstick_dev); - - static struct bus_type memstick_bus_type = { - .name = "memstick", -- .dev_attrs = memstick_dev_attrs, -+ .dev_groups = memstick_dev_groups, - .match = memstick_bus_match, - .uevent = memstick_uevent, - .probe = memstick_device_probe, |