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>

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index a56e865cdbfaa45095f26f6002dd7707560643c5..3ab45843da39dfc3fbff94ac18009bcf49600ea4 100644 (file)
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -837,7 +837,14 @@ static ssize_t bus_uevent_store(struct bus_type *bus,
        rc = kobject_synth_uevent(&bus->p->subsys.kobj, buf, 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