[S390] more bus_id -> dev_name conversions

Some further bus_id -> dev_name() conversions in s390 code.

Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

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;
 

diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 95b92dfec5a815435630b1e7692591aa2dedad0c..a8e755a88b014472501172cda05e17fba343c3a5 100644 (file)
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1526,7 +1526,7 @@ void ccw_device_set_notoper(struct ccw_device *cdev)
        struct subchannel *sch = to_subchannel(cdev->dev.parent);
 
        CIO_TRACE_EVENT(2, "notoper");
-       CIO_TRACE_EVENT(2, sch->dev.bus_id);
+       CIO_TRACE_EVENT(2, dev_name(&sch->dev));
        ccw_device_set_timeout(cdev, 0);
        cio_disable_subchannel(sch);
        cdev->private->state = DEV_STATE_NOT_OPER;

diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index 26e95858a8f929d92c8b66fb1e5766db93fd5d97..8f83fc994f508ef6069a1a9cc67eb30b196e945d 100644 (file)
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -2880,7 +2880,8 @@ claw_new_device(struct ccwgroup_device *cgdev)
        int ret;
        struct ccw_dev_id dev_id;
 
-       printk(KERN_INFO "claw: add for %s\n",cgdev->cdev[READ]->dev.bus_id);
+       printk(KERN_INFO "claw: add for %s\n",
+              dev_name(&cgdev->cdev[READ]->dev));
        CLAW_DBF_TEXT(2, setup, "new_dev");
        privptr = cgdev->dev.driver_data;
        cgdev->cdev[READ]->dev.driver_data = privptr;
@@ -2904,14 +2905,16 @@ claw_new_device(struct ccwgroup_device *cgdev)
        if (ret != 0) {
                printk(KERN_WARNING
                        "claw: ccw_device_set_online %s READ failed "
-                       "with ret = %d\n",cgdev->cdev[READ]->dev.bus_id,ret);
+                      "with ret = %d\n", dev_name(&cgdev->cdev[READ]->dev),
+                      ret);
                goto out;
        }
        ret = ccw_device_set_online(cgdev->cdev[WRITE]);
        if (ret != 0) {
                printk(KERN_WARNING
                        "claw: ccw_device_set_online %s WRITE failed "
-                       "with ret = %d\n",cgdev->cdev[WRITE]->dev.bus_id, ret);
+                      "with ret = %d\n", dev_name(&cgdev->cdev[WRITE]->dev)
+                      ret);
                goto out;
        }
        dev = alloc_netdev(0,"claw%d",claw_init_netdevice);
@@ -2987,7 +2990,7 @@ claw_shutdown_device(struct ccwgroup_device *cgdev)
        struct net_device *ndev;
        int     ret;
 
-       CLAW_DBF_TEXT_(2, setup, "%s", cgdev->dev.bus_id);
+       CLAW_DBF_TEXT_(2, setup, "%s", dev_name(&cgdev->dev));
        priv = cgdev->dev.driver_data;
        if (!priv)
                return -ENODEV;
@@ -3017,7 +3020,7 @@ claw_remove_device(struct ccwgroup_device *cgdev)
        struct claw_privbk *priv;
 
        BUG_ON(!cgdev);
-       CLAW_DBF_TEXT_(2, setup, "%s", cgdev->dev.bus_id);
+       CLAW_DBF_TEXT_(2, setup, "%s", dev_name(&cgdev->dev));
        priv = cgdev->dev.driver_data;
        BUG_ON(!priv);
        printk(KERN_INFO "claw: %s() called %s will be removed.\n",

diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index d2374cf4c4b973e434daacb1de9df82bf572d9fd..a4e29836a2aae6ffd15ab35c09c4d48f07b2eb3a 100644 (file)
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -1518,8 +1518,8 @@ static int ctcm_new_device(struct ccwgroup_device *cgdev)
 
        type = get_channel_type(&cdev0->id);
 
-       snprintf(read_id, CTCM_ID_SIZE, "ch-%s", cdev0->dev.bus_id);
-       snprintf(write_id, CTCM_ID_SIZE, "ch-%s", cdev1->dev.bus_id);
+       snprintf(read_id, CTCM_ID_SIZE, "ch-%s", dev_name(&cdev0->dev));
+       snprintf(write_id, CTCM_ID_SIZE, "ch-%s", dev_name(&cdev1->dev));
 
        ret = add_channel(cdev0, type, priv);
        if (ret)

diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index c69345f1f73c7901b40dfe5af88245a579a0da13..8a13071c444cab500dfe4318ef4d50bd16243aad 100644 (file)
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -619,7 +619,7 @@ struct zfcp_fsf_req_qtcb {
 #define ZFCP_SET                0x00000100
 #define ZFCP_CLEAR              0x00000200
 
-#define zfcp_get_busid_by_adapter(adapter) (adapter->ccw_device->dev.bus_id)
+#define zfcp_get_busid_by_adapter(adapter) (dev_name(&adapter->ccw_device->dev))
 
 /*
  * Helper functions for request ID management.

diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 782313131870ad928bc9a9a4072a5d3e5503ec02..9040f738ff333f47fd243486c311380f0ea00ebe 100644 (file)
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -1376,7 +1376,7 @@ static int zfcp_erp_thread(void *data)
        struct zfcp_erp_action *act;
        unsigned long flags;
 
-       daemonize("zfcperp%s", adapter->ccw_device->dev.bus_id);
+       daemonize("zfcperp%s", dev_name(&adapter->ccw_device->dev));
        /* Block all signals */
        siginitsetinv(&current->blocked, 0);
        atomic_set_mask(ZFCP_STATUS_ADAPTER_ERP_THREAD_UP, &adapter->status);

diff --git a/drivers/s390/scsi/zfcp_sysfs.c b/drivers/s390/scsi/zfcp_sysfs.c
index 2809d789b55cbbed03e3425d607302a61a1569e7..ca9293ba1766681c7bcc24721a29b4ac37a4f5bc 100644 (file)
--- a/drivers/s390/scsi/zfcp_sysfs.c
+++ b/drivers/s390/scsi/zfcp_sysfs.c
@@ -381,7 +381,7 @@ static ssize_t zfcp_sysfs_scsi_##_name##_show(struct device *dev,   \
 static DEVICE_ATTR(_name, S_IRUGO, zfcp_sysfs_scsi_##_name##_show, NULL);
 
 ZFCP_DEFINE_SCSI_ATTR(hba_id, "%s\n",
-       unit->port->adapter->ccw_device->dev.bus_id);
+                     dev_name(&unit->port->adapter->ccw_device->dev));
 ZFCP_DEFINE_SCSI_ATTR(wwpn, "0x%016llx\n",
                      (unsigned long long) unit->port->wwpn);
 ZFCP_DEFINE_SCSI_ATTR(fcp_lun, "0x%016llx\n",