Skip to content

Commit

Permalink
Driver core: remove class_device_rename
Browse files Browse the repository at this point in the history
No one uses it, and it wasn't exported to modules, so remove it.  The
only other user of it was the network code, which is now converted to
use struct device instead.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Greg Kroah-Hartman committed Feb 23, 2007
1 parent 9654640 commit 40cf67c
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 44 deletions.
42 changes: 0 additions & 42 deletions drivers/base/class.c
Original file line number Diff line number Diff line change
Expand Up @@ -840,48 +840,6 @@ void class_device_destroy(struct class *cls, dev_t devt)
class_device_unregister(class_dev);
}

int class_device_rename(struct class_device *class_dev, char *new_name)
{
int error = 0;
char *old_class_name = NULL, *new_class_name = NULL;

class_dev = class_device_get(class_dev);
if (!class_dev)
return -EINVAL;

pr_debug("CLASS: renaming '%s' to '%s'\n", class_dev->class_id,
new_name);

#ifdef CONFIG_SYSFS_DEPRECATED
if (class_dev->dev)
old_class_name = make_class_name(class_dev->class->name,
&class_dev->kobj);
#endif

strlcpy(class_dev->class_id, new_name, KOBJ_NAME_LEN);

error = kobject_rename(&class_dev->kobj, new_name);

#ifdef CONFIG_SYSFS_DEPRECATED
if (class_dev->dev) {
new_class_name = make_class_name(class_dev->class->name,
&class_dev->kobj);
if (new_class_name)
sysfs_create_link(&class_dev->dev->kobj,
&class_dev->kobj, new_class_name);
if (old_class_name)
sysfs_remove_link(&class_dev->dev->kobj,
old_class_name);
}
#endif
class_device_put(class_dev);

kfree(old_class_name);
kfree(new_class_name);

return error;
}

struct class_device * class_device_get(struct class_device *class_dev)
{
if (class_dev)
Expand Down
2 changes: 0 additions & 2 deletions include/linux/device.h
Original file line number Diff line number Diff line change
Expand Up @@ -294,8 +294,6 @@ extern void class_device_initialize(struct class_device *);
extern int __must_check class_device_add(struct class_device *);
extern void class_device_del(struct class_device *);

extern int class_device_rename(struct class_device *, char *);

extern struct class_device * class_device_get(struct class_device *);
extern void class_device_put(struct class_device *);

Expand Down

0 comments on commit 40cf67c

Please sign in to comment.