hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Greg Kroah-Hartman 2013-08-23 14:24:30 -07:00
parent ed1d2da28e
commit 3abd136218
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/powerpc/kernel/ibmebus.c
View File

@ -292,6 +292,7 @@ out:
return rc; return rc;
return count; return count;
} }
static BUS_ATTR(probe, S_IWUSR, NULL, ibmebus_store_probe);
static ssize_t ibmebus_store_remove(struct bus_type *bus, static ssize_t ibmebus_store_remove(struct bus_type *bus,
const char *buf, size_t count) const char *buf, size_t count)
@ -317,13 +318,14 @@ static ssize_t ibmebus_store_remove(struct bus_type *bus,
return -ENODEV; return -ENODEV;
} }
} }
static BUS_ATTR(remove, S_IWUSR, NULL, ibmebus_store_remove);
static struct attribute *ibmbus_bus_attrs[] = {
static struct bus_attribute ibmebus_bus_attrs[] = { &bus_attr_probe.attr,
__ATTR(probe, S_IWUSR, NULL, ibmebus_store_probe), &bus_attr_remove.attr,
__ATTR(remove, S_IWUSR, NULL, ibmebus_store_remove), NULL,
__ATTR_NULL
}; };
ATTRIBUTE_GROUPS(ibmbus_bus);
static int ibmebus_bus_bus_match(struct device *dev, struct device_driver *drv) 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_pm_ops = {
struct bus_type ibmebus_bus_type = { struct bus_type ibmebus_bus_type = {
.name = "ibmebus", .name = "ibmebus",
.uevent = of_device_uevent_modalias, .uevent = of_device_uevent_modalias,
.bus_attrs = ibmebus_bus_attrs, .bus_groups = ibmbus_bus_groups,
.match = ibmebus_bus_bus_match, .match = ibmebus_bus_bus_match,
.probe = ibmebus_bus_device_probe, .probe = ibmebus_bus_device_probe,
.remove = ibmebus_bus_device_remove, .remove = ibmebus_bus_device_remove,