Messages in this thread Patch in this message | | | From | Greg Kroah-Hartman <> | Subject | [PATCH 09/10] driver core: drop use of BUS_ATTR() | Date | Fri, 21 Dec 2018 08:54:41 +0100 |
| |
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> --- drivers/base/bus.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index f10d56c61a46..575bd6d752bd 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -830,7 +830,14 @@ static ssize_t bus_uevent_store(struct bus_type *bus, kobject_synth_uevent(&bus->p->subsys.kobj, buf, count); return 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 -- 2.20.1
| |