diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2004-10-31 21:06:31 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2004-10-31 21:06:31 -0800 |
| commit | e07d4e6100616189478dda62e0a261760f2cf4ff (patch) | |
| tree | 47469a731935e1c4e2d60c6224eb7b1608ef0bfb /drivers | |
| parent | a6391b5b189187af9f47c473ec9ffc515d05536e (diff) | |
[PATCH] Driver core: add driver symlink to device
Driver core: when binding device to a driver create "driver"
symlink in device's directory. Rename serio's
"driver" attribute to "drvctl" (write-only)
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <greg@kroah.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/bus.c | 2 | ||||
| -rw-r--r-- | drivers/input/serio/serio.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index 90e30ab241a2..5693d00c4096 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -246,6 +246,7 @@ void device_bind_driver(struct device * dev) list_add_tail(&dev->driver_list, &dev->driver->devices); sysfs_create_link(&dev->driver->kobj, &dev->kobj, kobject_name(&dev->kobj)); + sysfs_create_link(&dev->kobj, &dev->driver->kobj, "driver"); } @@ -370,6 +371,7 @@ void device_release_driver(struct device * dev) struct device_driver * drv = dev->driver; if (drv) { sysfs_remove_link(&drv->kobj, kobject_name(&dev->kobj)); + sysfs_remove_link(&dev->kobj, "driver"); list_del_init(&dev->driver_list); device_detach_shutdown(dev); if (drv->remove) diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c index 268ca1d63805..deb6014b9140 100644 --- a/drivers/input/serio/serio.c +++ b/drivers/input/serio/serio.c @@ -246,11 +246,6 @@ static ssize_t serio_show_description(struct device *dev, char *buf) return sprintf(buf, "%s\n", serio->name); } -static ssize_t serio_show_driver(struct device *dev, char *buf) -{ - return sprintf(buf, "%s\n", dev->driver ? dev->driver->name : "(none)"); -} - static ssize_t serio_rebind_driver(struct device *dev, const char *buf, size_t count) { struct serio *serio = to_serio_port(dev); @@ -307,7 +302,7 @@ static ssize_t serio_set_bind_mode(struct device *dev, const char *buf, size_t c static struct device_attribute serio_device_attrs[] = { __ATTR(description, S_IRUGO, serio_show_description, NULL), - __ATTR(driver, S_IWUSR | S_IRUGO, serio_show_driver, serio_rebind_driver), + __ATTR(drvctl, S_IWUSR, NULL, serio_rebind_driver), __ATTR(bind_mode, S_IWUSR | S_IRUGO, serio_show_bind_mode, serio_set_bind_mode), __ATTR_NULL }; |