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 /ppc-ibmebus-convert-bus-code-to-use-bus_groups.patch | |
| parent | 52894f7f35f3c6ad2b3362f021cdee69797d7a79 (diff) | |
| download | patches-7fa8fb124d5339a4e0d20d0a97a6b63731ce97d3.tar.gz | |
remove patches upstream now
Diffstat (limited to 'ppc-ibmebus-convert-bus-code-to-use-bus_groups.patch')
| -rw-r--r-- | ppc-ibmebus-convert-bus-code-to-use-bus_groups.patch | 56 |
1 files changed, 0 insertions, 56 deletions
diff --git a/ppc-ibmebus-convert-bus-code-to-use-bus_groups.patch b/ppc-ibmebus-convert-bus-code-to-use-bus_groups.patch deleted file mode 100644 index 7b6f87799b7277..00000000000000 --- a/ppc-ibmebus-convert-bus-code-to-use-bus_groups.patch +++ /dev/null @@ -1,56 +0,0 @@ -From foo@baz Fri Aug 23 13:21:43 PDT 2013 -Date: Fri, 23 Aug 2013 13:21:43 -0700 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: PPC: ibmebus: convert bus code to use bus_groups - -The bus_attrs field of struct bus_type is going away soon, dev_groups -should be used instead. This converts the ibmebus bus code to use the -correct field. - -Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> -Cc: Paul Mackerras <paulus@samba.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - arch/powerpc/kernel/ibmebus.c | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - ---- a/arch/powerpc/kernel/ibmebus.c -+++ b/arch/powerpc/kernel/ibmebus.c -@@ -292,6 +292,7 @@ out: - return rc; - return count; - } -+static BUS_ATTR(probe, S_IWUSR, NULL, ibmebus_store_probe); - - static ssize_t ibmebus_store_remove(struct bus_type *bus, - const char *buf, size_t count) -@@ -317,13 +318,14 @@ static ssize_t ibmebus_store_remove(stru - return -ENODEV; - } - } -+static BUS_ATTR(remove, S_IWUSR, NULL, ibmebus_store_remove); - -- --static struct bus_attribute ibmebus_bus_attrs[] = { -- __ATTR(probe, S_IWUSR, NULL, ibmebus_store_probe), -- __ATTR(remove, S_IWUSR, NULL, ibmebus_store_remove), -- __ATTR_NULL -+static struct attribute *ibmbus_bus_attrs[] = { -+ &bus_attr_probe.attr, -+ &bus_attr_remove.attr, -+ NULL, - }; -+ATTRIBUTE_GROUPS(ibmbus_bus); - - static int ibmebus_bus_bus_match(struct device *dev, struct device_driver *drv) - { -@@ -713,7 +715,7 @@ static struct dev_pm_ops ibmebus_bus_dev - struct bus_type ibmebus_bus_type = { - .name = "ibmebus", - .uevent = of_device_uevent_modalias, -- .bus_attrs = ibmebus_bus_attrs, -+ .bus_groups = ibmbus_bus_groups, - .match = ibmebus_bus_bus_match, - .probe = ibmebus_bus_device_probe, - .remove = ibmebus_bus_device_remove, |