Commit 7ac1cf4a authored by Kay Sievers's avatar Kay Sievers Committed by Greg Kroah-Hartman

Driver core: add uevent file for bus and driver

This has been in the SuSE kernels for some time now.
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5c5daf65
...@@ -610,6 +610,17 @@ static inline int add_probe_files(struct bus_type *bus) { return 0; } ...@@ -610,6 +610,17 @@ static inline int add_probe_files(struct bus_type *bus) { return 0; }
static inline void remove_probe_files(struct bus_type *bus) {} static inline void remove_probe_files(struct bus_type *bus) {}
#endif #endif
static ssize_t driver_uevent_store(struct device_driver *drv,
const char *buf, size_t count)
{
enum kobject_action action;
if (kobject_action_type(buf, count, &action) == 0)
kobject_uevent(&drv->kobj, action);
return count;
}
static DRIVER_ATTR(uevent, S_IWUSR, NULL, driver_uevent_store);
/** /**
* bus_add_driver - Add a driver to the bus. * bus_add_driver - Add a driver to the bus.
* @drv: driver. * @drv: driver.
...@@ -640,6 +651,11 @@ int bus_add_driver(struct device_driver *drv) ...@@ -640,6 +651,11 @@ int bus_add_driver(struct device_driver *drv)
klist_add_tail(&drv->knode_bus, &bus->klist_drivers); klist_add_tail(&drv->knode_bus, &bus->klist_drivers);
module_add_driver(drv->owner, drv); module_add_driver(drv->owner, drv);
error = driver_create_file(drv, &driver_attr_uevent);
if (error) {
printk(KERN_ERR "%s: uevent attr (%s) failed\n",
__FUNCTION__, drv->name);
}
error = driver_add_attrs(bus, drv); error = driver_add_attrs(bus, drv);
if (error) { if (error) {
/* How the hell do we get out of this pickle? Give up */ /* How the hell do we get out of this pickle? Give up */
...@@ -677,6 +693,7 @@ void bus_remove_driver(struct device_driver * drv) ...@@ -677,6 +693,7 @@ void bus_remove_driver(struct device_driver * drv)
remove_bind_files(drv); remove_bind_files(drv);
driver_remove_attrs(drv->bus, drv); driver_remove_attrs(drv->bus, drv);
driver_remove_file(drv, &driver_attr_uevent);
klist_remove(&drv->knode_bus); klist_remove(&drv->knode_bus);
pr_debug("bus %s: remove driver %s\n", drv->bus->name, drv->name); pr_debug("bus %s: remove driver %s\n", drv->bus->name, drv->name);
driver_detach(drv); driver_detach(drv);
...@@ -804,6 +821,17 @@ static void klist_devices_put(struct klist_node *n) ...@@ -804,6 +821,17 @@ static void klist_devices_put(struct klist_node *n)
put_device(dev); put_device(dev);
} }
static ssize_t bus_uevent_store(struct bus_type *bus,
const char *buf, size_t count)
{
enum kobject_action action;
if (kobject_action_type(buf, count, &action) == 0)
kobject_uevent(&bus->subsys.kobj, action);
return count;
}
static BUS_ATTR(uevent, S_IWUSR, NULL, bus_uevent_store);
/** /**
* bus_register - register a bus with the system. * bus_register - register a bus with the system.
* @bus: bus. * @bus: bus.
...@@ -828,6 +856,10 @@ int bus_register(struct bus_type * bus) ...@@ -828,6 +856,10 @@ int bus_register(struct bus_type * bus)
if (retval) if (retval)
goto out; goto out;
retval = bus_create_file(bus, &bus_attr_uevent);
if (retval)
goto bus_uevent_fail;
kobject_set_name(&bus->devices.kobj, "devices"); kobject_set_name(&bus->devices.kobj, "devices");
bus->devices.kobj.parent = &bus->subsys.kobj; bus->devices.kobj.parent = &bus->subsys.kobj;
retval = kset_register(&bus->devices); retval = kset_register(&bus->devices);
...@@ -863,6 +895,8 @@ int bus_register(struct bus_type * bus) ...@@ -863,6 +895,8 @@ int bus_register(struct bus_type * bus)
bus_drivers_fail: bus_drivers_fail:
kset_unregister(&bus->devices); kset_unregister(&bus->devices);
bus_devices_fail: bus_devices_fail:
bus_remove_file(bus, &bus_attr_uevent);
bus_uevent_fail:
subsystem_unregister(&bus->subsys); subsystem_unregister(&bus->subsys);
out: out:
return retval; return retval;
...@@ -882,6 +916,7 @@ void bus_unregister(struct bus_type * bus) ...@@ -882,6 +916,7 @@ void bus_unregister(struct bus_type * bus)
remove_probe_files(bus); remove_probe_files(bus);
kset_unregister(&bus->drivers); kset_unregister(&bus->drivers);
kset_unregister(&bus->devices); kset_unregister(&bus->devices);
bus_remove_file(bus, &bus_attr_uevent);
subsystem_unregister(&bus->subsys); subsystem_unregister(&bus->subsys);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment