device create: s390: convert device_create_drvdata to device_create

[linux-2.6-omap-h63xx.git] / drivers / s390 / char / vmur.c

diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index c1f352b84868c16affd93a7ff7af1f162527eb2b..9020eba620eee22fe8ae36bd0716596c38ae9a7f 100644 (file)
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -886,19 +886,18 @@ static int ur_set_online(struct ccw_device *cdev)
                goto fail_free_cdev;
        if (urd->cdev->id.cu_type == READER_PUNCH_DEVTYPE) {
                if (urd->class == DEV_CLASS_UR_I)
-                       sprintf(node_id, "vmrdr-%s", cdev->dev.bus_id);
+                       sprintf(node_id, "vmrdr-%s", dev_name(&cdev->dev));
                if (urd->class == DEV_CLASS_UR_O)
-                       sprintf(node_id, "vmpun-%s", cdev->dev.bus_id);
+                       sprintf(node_id, "vmpun-%s", dev_name(&cdev->dev));
        } else if (urd->cdev->id.cu_type == PRINTER_DEVTYPE) {
-               sprintf(node_id, "vmprt-%s", cdev->dev.bus_id);
+               sprintf(node_id, "vmprt-%s", dev_name(&cdev->dev));
        } else {
                rc = -EOPNOTSUPP;
                goto fail_free_cdev;
        }
 
-       urd->device = device_create_drvdata(vmur_class, NULL,
-                                           urd->char_device->dev, NULL,
-                                           "%s", node_id);
+       urd->device = device_create(vmur_class, NULL, urd->char_device->dev,
+                                   NULL, "%s", node_id);
        if (IS_ERR(urd->device)) {
                rc = PTR_ERR(urd->device);
                TRACE("ur_set_online: device_create rc=%d\n", rc);