lkml.org 
[lkml]   [2006]   [Sep]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 29/47] Driver core: add device_rename function
    Date
    From: Greg Kroah-Hartman <gregkh@suse.de>

    The network layer needs this to convert to using struct device instead
    of a struct class_device.

    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/base/core.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++
    include/linux/device.h | 1 +
    2 files changed, 56 insertions(+), 0 deletions(-)

    diff --git a/drivers/base/core.c b/drivers/base/core.c
    index f1228f2..0db4756 100644
    --- a/drivers/base/core.c
    +++ b/drivers/base/core.c
    @@ -736,3 +736,58 @@ void device_destroy(struct class *class,
    device_unregister(dev);
    }
    EXPORT_SYMBOL_GPL(device_destroy);
    +
    +/**
    + * device_rename - renames a device
    + * @dev: the pointer to the struct device to be renamed
    + * @new_name: the new name of the device
    + */
    +int device_rename(struct device *dev, char *new_name)
    +{
    + char *old_class_name = NULL;
    + char *new_class_name = NULL;
    + char *old_symlink_name = NULL;
    + int error;
    +
    + dev = get_device(dev);
    + if (!dev)
    + return -EINVAL;
    +
    + pr_debug("DEVICE: renaming '%s' to '%s'\n", dev->bus_id, new_name);
    +
    + if ((dev->class) && (dev->parent))
    + old_class_name = make_class_name(dev->class->name, &dev->kobj);
    +
    + if (dev->class) {
    + old_symlink_name = kmalloc(BUS_ID_SIZE, GFP_KERNEL);
    + if (!old_symlink_name)
    + return -ENOMEM;
    + strlcpy(old_symlink_name, dev->bus_id, BUS_ID_SIZE);
    + }
    +
    + strlcpy(dev->bus_id, new_name, BUS_ID_SIZE);
    +
    + error = kobject_rename(&dev->kobj, new_name);
    +
    + if (old_class_name) {
    + new_class_name = make_class_name(dev->class->name, &dev->kobj);
    + if (new_class_name) {
    + sysfs_create_link(&dev->parent->kobj, &dev->kobj,
    + new_class_name);
    + sysfs_remove_link(&dev->parent->kobj, old_class_name);
    + }
    + }
    + if (dev->class) {
    + sysfs_remove_link(&dev->class->subsys.kset.kobj,
    + old_symlink_name);
    + sysfs_create_link(&dev->class->subsys.kset.kobj, &dev->kobj,
    + dev->bus_id);
    + }
    + put_device(dev);
    +
    + kfree(old_class_name);
    + kfree(new_class_name);
    + kfree(old_symlink_name);
    +
    + return error;
    +}
    diff --git a/include/linux/device.h b/include/linux/device.h
    index 3122bd2..3400e09 100644
    --- a/include/linux/device.h
    +++ b/include/linux/device.h
    @@ -380,6 +380,7 @@ extern int device_add(struct device * de
    extern void device_del(struct device * dev);
    extern int device_for_each_child(struct device *, void *,
    int (*fn)(struct device *, void *));
    +extern int device_rename(struct device *dev, char *new_name);

    /*
    * Manual binding of a device to driver. See drivers/base/bus.c
    --
    1.4.2.1
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-09-26 07:57    [W:0.027 / U:30.980 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site