driverfs: add device_remove_symlink wrapper for removing symlinks (since driverfs

API is just about to change...)

diff --git a/drivers/base/base.h b/drivers/base/base.h
index 5413942ce8f60f2a36cd76bb3bbfa26c49b838b4..35f09fc219e1d802eef7f915e82cb98091a02ebd 100644 (file)
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -17,6 +17,7 @@ extern int device_make_dir(struct device * dev);
 extern void device_remove_dir(struct device * dev);
 
 extern int device_bus_link(struct device * dev);
+extern void device_remove_symlink(struct driver_dir_entry * dir, const char * name);
 
 extern int driver_attach(struct device_driver * drv);
 extern void driver_detach(struct device_driver * drv);

diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 95d41d8969112984de41fdef01b1040e4142a673..4f9affd882539bb5e4ab0f97c314e7cc8eacb97c 100644 (file)
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -140,7 +140,7 @@ int bus_add_device(struct device * dev)
 void bus_remove_device(struct device * dev)
 {
        if (dev->bus) {
-               driverfs_remove_file(&dev->bus->device_dir,dev->bus_id);
+               device_remove_symlink(&dev->bus->device_dir,dev->bus_id);
                write_lock(&dev->bus->lock);
                list_del_init(&dev->bus_list);
                write_unlock(&dev->bus->lock);

diff --git a/drivers/base/fs.c b/drivers/base/fs.c
index 0df919e7f0825b3c43dc8dcf7dcb02eae0924328..4aa4938461e870c7a775b0f85d6e22854c0d7bba 100644 (file)
--- a/drivers/base/fs.c
+++ b/drivers/base/fs.c
@@ -127,6 +127,11 @@ int device_bus_link(struct device * dev)
        return error;
 }
 
+void device_remove_symlink(struct driver_dir_entry * dir, const char * name)
+{
+       driverfs_remove_file(dir,name);
+}
+
 int device_create_dir(struct driver_dir_entry * dir, struct driver_dir_entry * parent)
 {
        dir->mode  = (S_IFDIR| S_IRWXU | S_IRUGO | S_IXUGO);