driver core: drop use of BUS_ATTR()

We are trying to get rid of BUS_ATTR() so drop the last user of it from
the tree.  We had to "open code" it in order to prevent a function name
conflict due to the use of DEVICE_ATTR_WO() earlier in the file :(

Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2018-10-29 16:31:26 +01:00
parent 2e7189b6c7
commit a472304185
1 changed files with 8 additions and 1 deletions

View File

@ -837,7 +837,14 @@ static ssize_t bus_uevent_store(struct bus_type *bus,
rc = kobject_synth_uevent(&bus->p->subsys.kobj, buf, count); rc = kobject_synth_uevent(&bus->p->subsys.kobj, buf, count);
return rc ? rc : count; return rc ? rc : count;
} }
static BUS_ATTR(uevent, S_IWUSR, NULL, bus_uevent_store); /*
* "open code" the old BUS_ATTR() macro here. We want to use BUS_ATTR_WO()
* here, but can not use it as earlier in the file we have
* DEVICE_ATTR_WO(uevent), which would cause a clash with the with the store
* function name.
*/
static struct bus_attribute bus_attr_uevent = __ATTR(uevent, S_IWUSR, NULL,
bus_uevent_store);
/** /**
* bus_register - register a driver-core subsystem * bus_register - register a driver-core subsystem