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>
{
struct device *parent = NULL;
struct class_interface *class_intf;
{
struct device *parent = NULL;
struct class_interface *class_intf;
- if (!dev || !strlen(dev->bus_id)) {
- error = -EINVAL;
- goto Done;
- }
+ if (!dev)
+ 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__);
class_intf->add_dev(dev, class_intf);
mutex_unlock(&dev->class->p->class_mutex);
}
class_intf->add_dev(dev, class_intf);
mutex_unlock(&dev->class->p->class_mutex);
}
put_device(dev);
return error;
DPMError:
put_device(dev);
return error;
DPMError:
cleanup_device_parent(dev);
if (parent)
put_device(parent);
cleanup_device_parent(dev);
if (parent)
put_device(parent);
struct kobject kobj;
char bus_id[BUS_ID_SIZE]; /* position on parent bus */
struct kobject kobj;
char bus_id[BUS_ID_SIZE]; /* position on parent bus */
+ const char *init_name; /* initial name of the device */
struct device_type *type;
unsigned uevent_suppress:1;
struct device_type *type;
unsigned uevent_suppress:1;