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:
Родитель
ed1d2da28e
Коммит
3abd136218
|
@ -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(struct bus_type *bus,
|
|||
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_pm_ops = {
|
|||
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,
|
||||
|
|
Загрузка…
Ссылка в новой задаче