[S390] more bus_id -> dev_name conversions

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

diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index c3dee900a5c8b84608ef868ab73d4d0df0206cf3..1792b2c0130e2c3948ddab8e4798790a7af7b99c 100644 (file)
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -1171,7 +1171,7 @@ static int raw3270_create_attributes(struct raw3270 *rp)
        rp->clttydev = device_create_drvdata(class3270, &rp->cdev->dev,
                                             MKDEV(IBM_TTY3270_MAJOR, rp->minor),
                                             NULL,
-                                            "tty%s", rp->cdev->dev.bus_id);
+                                            "tty%s", dev_name(&rp->cdev->dev));
        if (IS_ERR(rp->clttydev)) {
                rc = PTR_ERR(rp->clttydev);
                goto out_ttydev;
@@ -1180,7 +1180,7 @@ static int raw3270_create_attributes(struct raw3270 *rp)
        rp->cltubdev = device_create_drvdata(class3270, &rp->cdev->dev,
                                             MKDEV(IBM_FS3270_MAJOR, rp->minor),
                                             NULL,
-                                            "tub%s", rp->cdev->dev.bus_id);
+                                            "tub%s", dev_name(&rp->cdev->dev));
        if (!IS_ERR(rp->cltubdev))
                goto out;