hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

driver core: get rid of struct device's bus_id string array 

Now that all users of bus_id is gone, we can remove it from struct
device.

Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kay Sievers 2009-01-25 15:17:37 +01:00 committed by Greg Kroah-Hartman
parent 6866ac9db0
commit 1fa5ae857b
4 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/base/core.c
View File

@ -777,17 +777,12 @@ static void device_remove_class_symlinks(struct device *dev)
int dev_set_name(struct device *dev, const char *fmt, ...) int dev_set_name(struct device *dev, const char *fmt, ...)
{ {
va_list vargs; va_list vargs;
char *s; int err;
va_start(vargs, fmt); va_start(vargs, fmt);
vsnprintf(dev->bus_id, sizeof(dev->bus_id), fmt, vargs); err = kobject_set_name_vargs(&dev->kobj, fmt, vargs);
va_end(vargs); va_end(vargs);
return err;
/* ewww... some of these buggers have / in the name... */
while ((s = strchr(dev->bus_id, '/')))
*s = '!';
return 0;
} }
EXPORT_SYMBOL_GPL(dev_set_name); EXPORT_SYMBOL_GPL(dev_set_name);
@ -864,12 +859,17 @@ int device_add(struct device *dev)
if (!dev) if (!dev)
goto done; goto done;
/* Temporarily support init_name if it is set. /*
* It will override bus_id for now */ * for statically allocated devices, which should all be converted
if (dev->init_name) * some day, we need to initialize the name. We prevent reading back
dev_set_name(dev, "%s", dev->init_name); * the name, and force the use of dev_name()
*/
if (dev->init_name) {
dev_set_name(dev, dev->init_name);
dev->init_name = NULL;
}
if (!strlen(dev->bus_id)) if (!dev_name(dev))
goto done; goto done;
pr_debug("device: '%s': %s\n", dev_name(dev), __func__); pr_debug("device: '%s': %s\n", dev_name(dev), __func__);
@ -1348,7 +1348,10 @@ struct device *device_create_vargs(struct class *class, struct device *parent,
dev->release = device_create_release; dev->release = device_create_release;
dev_set_drvdata(dev, drvdata); dev_set_drvdata(dev, drvdata);
vsnprintf(dev->bus_id, BUS_ID_SIZE, fmt, args); retval = kobject_set_name_vargs(&dev->kobj, fmt, args);
if (retval)
goto error;
retval = device_register(dev); retval = device_register(dev);
if (retval) if (retval)
goto error; goto error;
@ -1452,19 +1455,15 @@ int device_rename(struct device *dev, char *new_name)
old_class_name = make_class_name(dev->class->name, &dev->kobj); old_class_name = make_class_name(dev->class->name, &dev->kobj);
#endif #endif
old_device_name = kmalloc(BUS_ID_SIZE, GFP_KERNEL); old_device_name = kstrdup(dev_name(dev), GFP_KERNEL);
if (!old_device_name) { if (!old_device_name) {
error = -ENOMEM; error = -ENOMEM;
goto out; goto out;
} }
strlcpy(old_device_name, dev->bus_id, BUS_ID_SIZE);
strlcpy(dev->bus_id, new_name, BUS_ID_SIZE);
error = kobject_rename(&dev->kobj, new_name); error = kobject_rename(&dev->kobj, new_name);
if (error) { if (error)
strlcpy(dev->bus_id, old_device_name, BUS_ID_SIZE);
goto out; goto out;
}
#ifdef CONFIG_SYSFS_DEPRECATED #ifdef CONFIG_SYSFS_DEPRECATED
if (old_class_name) { if (old_class_name) {

4
include/linux/device.h
View File

@ -374,7 +374,6 @@ struct device {
struct device *parent; struct device *parent;
struct kobject kobj; struct kobject kobj;
char bus_id[BUS_ID_SIZE]; /* position on parent bus */
unsigned uevent_suppress:1; unsigned uevent_suppress:1;
const char *init_name; /* initial name of the device */ const char *init_name; /* initial name of the device */
struct device_type *type; struct device_type *type;
@ -427,8 +426,7 @@ struct device {
static inline const char *dev_name(const struct device *dev) static inline const char *dev_name(const struct device *dev)
{ {
/* will be changed into kobject_name(&dev->kobj) in the near future */ return kobject_name(&dev->kobj);
return dev->bus_id;
} }
extern int dev_set_name(struct device *dev, const char *name, ...) extern int dev_set_name(struct device *dev, const char *name, ...)

2
include/linux/kobject.h
View File

@ -72,6 +72,8 @@ struct kobject {
extern int kobject_set_name(struct kobject *kobj, const char *name, ...) extern int kobject_set_name(struct kobject *kobj, const char *name, ...)
__attribute__((format(printf, 2, 3))); __attribute__((format(printf, 2, 3)));
extern int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
va_list vargs);
static inline const char *kobject_name(const struct kobject *kobj) static inline const char *kobject_name(const struct kobject *kobj)
{ {

2
lib/kobject.c
View File

@ -212,7 +212,7 @@ static int kobject_add_internal(struct kobject *kobj)
* @fmt: format string used to build the name * @fmt: format string used to build the name
* @vargs: vargs to format the string. * @vargs: vargs to format the string.
*/ */
static int kobject_set_name_vargs(struct kobject *kobj, const char *fmt, int kobject_set_name_vargs(struct kobject *kobj, const char *fmt,
va_list vargs) va_list vargs)
{ {
const char *old_name = kobj->name; const char *old_name = kobj->name;