1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index c1f352b84868..9020eba620ee 100644
--- 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);