|
@@ -260,16 +260,14 @@ static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp,
|
|
|
vio_fill_channel_info(hp, mp, vdev);
|
|
|
|
|
|
if (!id) {
|
|
|
- snprintf(vdev->dev.bus_id, BUS_ID_SIZE, "%s",
|
|
|
- bus_id_name);
|
|
|
+ dev_set_name(&vdev->dev, "%s", bus_id_name);
|
|
|
vdev->dev_no = ~(u64)0;
|
|
|
} else if (!cfg_handle) {
|
|
|
- snprintf(vdev->dev.bus_id, BUS_ID_SIZE, "%s-%lu",
|
|
|
- bus_id_name, *id);
|
|
|
+ dev_set_name(&vdev->dev, "%s-%lu", bus_id_name, *id);
|
|
|
vdev->dev_no = *id;
|
|
|
} else {
|
|
|
- snprintf(vdev->dev.bus_id, BUS_ID_SIZE, "%s-%lu-%lu",
|
|
|
- bus_id_name, *cfg_handle, *id);
|
|
|
+ dev_set_name(&vdev->dev, "%s-%lu-%lu", bus_id_name,
|
|
|
+ *cfg_handle, *id);
|
|
|
vdev->dev_no = *cfg_handle;
|
|
|
}
|
|
|
|
|
@@ -292,12 +290,12 @@ static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp,
|
|
|
}
|
|
|
vdev->dp = dp;
|
|
|
|
|
|
- printk(KERN_INFO "VIO: Adding device %s\n", vdev->dev.bus_id);
|
|
|
+ printk(KERN_INFO "VIO: Adding device %s\n", dev_name(&vdev->dev));
|
|
|
|
|
|
err = device_register(&vdev->dev);
|
|
|
if (err) {
|
|
|
printk(KERN_ERR "VIO: Could not register device %s, err=%d\n",
|
|
|
- vdev->dev.bus_id, err);
|
|
|
+ dev_name(&vdev->dev), err);
|
|
|
kfree(vdev);
|
|
|
return NULL;
|
|
|
}
|
|
@@ -330,7 +328,7 @@ static void vio_remove(struct mdesc_handle *hp, u64 node)
|
|
|
dev = device_find_child(&root_vdev->dev, (void *) node,
|
|
|
vio_md_node_match);
|
|
|
if (dev) {
|
|
|
- printk(KERN_INFO "VIO: Removing device %s\n", dev->bus_id);
|
|
|
+ printk(KERN_INFO "VIO: Removing device %s\n", dev_name(dev));
|
|
|
|
|
|
device_unregister(dev);
|
|
|
}
|