GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-04-13 01:44:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

driver core: add init_name to struct device

Browse source 
This gives us a way to handle both the bus_id and init_name values being
used for a while during the transition period.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2008-05-30 10:45:12 -07:00
parent 3b98aeaf3a
commit c906a48adc
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/base/core.c
View file

@ -844,13 +844,19 @@ int device_add(struct device *dev)
{ {
struct device *parent = NULL; struct device *parent = NULL;
struct class_interface *class_intf; struct class_interface *class_intf;
int error; int error = -EINVAL;
dev = get_device(dev); dev = get_device(dev);
if (!dev || !strlen(dev->bus_id)) { if (!dev)
error = -EINVAL; goto done;
goto Done;
} /* Temporarily support init_name if it is set.
* It will override bus_id for now */
if (dev->init_name)
dev_set_name(dev, "%s", dev->init_name);
if (!strlen(dev->bus_id))
goto done;
pr_debug("device: '%s': %s\n", dev->bus_id, __func__); pr_debug("device: '%s': %s\n", dev->bus_id, __func__);
@ -919,7 +925,7 @@ int device_add(struct device *dev)
class_intf->add_dev(dev, class_intf); class_intf->add_dev(dev, class_intf);
mutex_unlock(&dev->class->p->class_mutex); mutex_unlock(&dev->class->p->class_mutex);
} }
Done: done:
put_device(dev); put_device(dev);
return error; return error;
DPMError: DPMError:
@ -946,7 +952,7 @@ int device_add(struct device *dev)
cleanup_device_parent(dev); cleanup_device_parent(dev);
if (parent) if (parent)
put_device(parent); put_device(parent);
goto Done; goto done;
} }
/** /**

1
include/linux/device.h
View file

@ -358,6 +358,7 @@ struct device {
struct kobject kobj; struct kobject kobj;
char bus_id[BUS_ID_SIZE]; /* position on parent bus */ char bus_id[BUS_ID_SIZE]; /* position on parent bus */
const char *init_name; /* initial name of the device */
struct device_type *type; struct device_type *type;
unsigned uevent_suppress:1; unsigned uevent_suppress:1;