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 /ssb-convert-bus-code-to-use-dev_groups.patch | |
| parent | 52894f7f35f3c6ad2b3362f021cdee69797d7a79 (diff) | |
| download | patches-7fa8fb124d5339a4e0d20d0a97a6b63731ce97d3.tar.gz | |
remove patches upstream now
Diffstat (limited to 'ssb-convert-bus-code-to-use-dev_groups.patch')
| -rw-r--r-- | ssb-convert-bus-code-to-use-dev_groups.patch | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/ssb-convert-bus-code-to-use-dev_groups.patch b/ssb-convert-bus-code-to-use-dev_groups.patch deleted file mode 100644 index c6358f0b2098ae..00000000000000 --- a/ssb-convert-bus-code-to-use-dev_groups.patch +++ /dev/null @@ -1,66 +0,0 @@ -From foo@baz Sun Oct 6 13:53:48 PDT 2013 -Date: Sun, 06 Oct 2013 13:53:48 -0700 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: ssb: 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 ssb bus code to use the -correct field. - -Cc: Michael Buesch <m@bues.ch> -Cc: <netdev@vger.kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - ---- - drivers/ssb/main.c | 23 +++++++++++++---------- - 1 file changed, 13 insertions(+), 10 deletions(-) - ---- a/drivers/ssb/main.c -+++ b/drivers/ssb/main.c -@@ -374,7 +374,8 @@ static ssize_t \ - attrib##_show(struct device *dev, struct device_attribute *attr, char *buf) \ - { \ - return sprintf(buf, format_string, dev_to_ssb_dev(dev)->field); \ --} -+} \ -+static DEVICE_ATTR_RO(attrib); - - ssb_config_attr(core_num, core_index, "%u\n") - ssb_config_attr(coreid, id.coreid, "0x%04x\n") -@@ -387,16 +388,18 @@ name_show(struct device *dev, struct dev - return sprintf(buf, "%s\n", - ssb_core_name(dev_to_ssb_dev(dev)->id.coreid)); - } -+static DEVICE_ATTR_RO(name); - --static struct device_attribute ssb_device_attrs[] = { -- __ATTR_RO(name), -- __ATTR_RO(core_num), -- __ATTR_RO(coreid), -- __ATTR_RO(vendor), -- __ATTR_RO(revision), -- __ATTR_RO(irq), -- __ATTR_NULL, -+static struct attribute *ssb_device_attrs[] = { -+ &dev_attr_name.attr, -+ &dev_attr_core_num.attr, -+ &dev_attr_coreid.attr, -+ &dev_attr_vendor.attr, -+ &dev_attr_revision.attr, -+ &dev_attr_irq.attr, -+ NULL, - }; -+ATTRIBUTE_GROUPS(ssb_device); - - static struct bus_type ssb_bustype = { - .name = "ssb", -@@ -407,7 +410,7 @@ static struct bus_type ssb_bustype = { - .suspend = ssb_device_suspend, - .resume = ssb_device_resume, - .uevent = ssb_device_uevent, -- .dev_attrs = ssb_device_attrs, -+ .dev_groups = ssb_device_groups, - }; - - static void ssb_buses_lock(void) |