[S390] bus_id -> dev_name conversions

bus_id -> dev_name() conversions in s390 code.

[cornelia.huck@de.ibm.com: minor adaptions]
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Cc: 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>

7 files changed, 52 insertions, 47 deletions

diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index e10ac9ab2d44..26e95858a8f9 100644
--- a/drivers/s390/net/claw.c
+++ b/drivers/s390/net/claw.c
@@ -299,7 +299,7 @@ claw_probe(struct ccwgroup_device *cgdev)
                 probe_error(cgdev);
                 put_device(&cgdev->dev);
                 printk(KERN_WARNING "add_files failed %s %s Exit Line %d \n",
-                        cgdev->cdev[0]->dev.bus_id,__func__,__LINE__);
+                        dev_name(&cgdev->cdev[0]->dev), __func__, __LINE__);
                 CLAW_DBF_TEXT_(2, setup, "probex%d", rc);
                 return rc;
         }
@@ -584,7 +584,7 @@ claw_irq_handler(struct ccw_device *cdev,
         if (!cdev->dev.driver_data) {
                 printk(KERN_WARNING "claw: unsolicited interrupt for device:"
                         "%s received c-%02x d-%02x\n",
-                       cdev->dev.bus_id, irb->scsw.cmd.cstat,
+                       dev_name(&cdev->dev), irb->scsw.cmd.cstat,
                        irb->scsw.cmd.dstat);
                 CLAW_DBF_TEXT(2, trace, "badirq");
                 return;
@@ -598,7 +598,7 @@ claw_irq_handler(struct ccw_device *cdev,
                 p_ch = &privptr->channel[WRITE];
         else {
                 printk(KERN_WARNING "claw: Can't determine channel for "
-                        "interrupt, device %s\n", cdev->dev.bus_id);
+                        "interrupt, device %s\n", dev_name(&cdev->dev));
                 CLAW_DBF_TEXT(2, trace, "badchan");
                 return;
         }
@@ -662,7 +662,7 @@ claw_irq_handler(struct ccw_device *cdev,
                         printk(KERN_WARNING "claw: unsolicited "
                                 "interrupt for device:"
                                 "%s received c-%02x d-%02x\n",
-                                cdev->dev.bus_id,
+                                dev_name(&cdev->dev),
                                 irb->scsw.cmd.cstat,
                                 irb->scsw.cmd.dstat);
                         return;
@@ -1136,19 +1136,20 @@ ccw_check_return_code(struct ccw_device *cdev, int return_code)
                         break;
                 case -ENODEV:
                         printk(KERN_EMERG "%s: Missing device called "
-                                "for IO ENODEV\n", cdev->dev.bus_id);
+                                "for IO ENODEV\n", dev_name(&cdev->dev));
                         break;
                 case -EIO:
                         printk(KERN_EMERG "%s: Status pending... EIO \n",
-                                cdev->dev.bus_id);
+                                dev_name(&cdev->dev));
                         break;
                 case -EINVAL:
                         printk(KERN_EMERG "%s: Invalid Dev State EINVAL \n",
-                                cdev->dev.bus_id);
+                                dev_name(&cdev->dev));
                         break;
                 default:
                         printk(KERN_EMERG "%s: Unknown error in "
-                                 "Do_IO %d\n",cdev->dev.bus_id, return_code);
+                                 "Do_IO %d\n", dev_name(&cdev->dev),
+                               return_code);
                 }
         }
         CLAW_DBF_TEXT(4, trace, "ccwret");
@@ -2848,11 +2849,11 @@ add_channel(struct ccw_device *cdev,int i,struct claw_privbk *privptr)
         struct chbk *p_ch;
         struct ccw_dev_id dev_id;
 
-        CLAW_DBF_TEXT_(2, setup, "%s", cdev->dev.bus_id);
+        CLAW_DBF_TEXT_(2, setup, "%s", dev_name(&cdev->dev));
         privptr->channel[i].flag  = i+1;   /* Read is 1 Write is 2 */
         p_ch = &privptr->channel[i];
         p_ch->cdev = cdev;
-        snprintf(p_ch->id, CLAW_ID_SIZE, "cl-%s", cdev->dev.bus_id);
+        snprintf(p_ch->id, CLAW_ID_SIZE, "cl-%s", dev_name(&cdev->dev));
         ccw_device_get_id(cdev, &dev_id);
         p_ch->devno = dev_id.devno;
         if ((p_ch->irb = kzalloc(sizeof (struct irb),GFP_KERNEL)) == NULL) {
@@ -3020,7 +3021,7 @@ claw_remove_device(struct ccwgroup_device *cgdev)
         priv = cgdev->dev.driver_data;
         BUG_ON(!priv);
         printk(KERN_INFO "claw: %s() called %s will be removed.\n",
-                        __func__,cgdev->cdev[0]->dev.bus_id);
+                        __func__, dev_name(&cgdev->cdev[0]->dev));
         if (cgdev->state == CCWGROUP_ONLINE)
                 claw_shutdown_device(cgdev);
         claw_remove_files(&cgdev->dev);
diff --git a/drivers/s390/net/claw.h b/drivers/s390/net/claw.h
index 1a89d989f348..005072c420d3 100644
--- a/drivers/s390/net/claw.h
+++ b/drivers/s390/net/claw.h
@@ -85,7 +85,7 @@
 #define CLAW_MAX_DEV            256        /*      max claw devices          */
 #define MAX_NAME_LEN            8          /* host name, adapter name length */
 #define CLAW_FRAME_SIZE         4096
-#define CLAW_ID_SIZE            BUS_ID_SIZE+3
+#define CLAW_ID_SIZE            20+3
 
 /* state machine codes used in claw_irq_handler */
 
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c
index b11fec24c7d2..d2374cf4c4b9 100644
--- a/drivers/s390/net/ctcm_main.c
+++ b/drivers/s390/net/ctcm_main.c
@@ -277,18 +277,18 @@ static long ctcm_check_irb_error(struct ccw_device *cdev, struct irb *irb)
 
         CTCM_DBF_TEXT_(ERROR, CTC_DBF_WARN,
                         "irb error %ld on device %s\n",
-                                PTR_ERR(irb), cdev->dev.bus_id);
+                                PTR_ERR(irb), dev_name(&cdev->dev));
 
         switch (PTR_ERR(irb)) {
         case -EIO:
-                ctcm_pr_warn("i/o-error on device %s\n", cdev->dev.bus_id);
+                ctcm_pr_warn("i/o-error on device %s\n", dev_name(&cdev->dev));
                 break;
         case -ETIMEDOUT:
-                ctcm_pr_warn("timeout on device %s\n", cdev->dev.bus_id);
+                ctcm_pr_warn("timeout on device %s\n", dev_name(&cdev->dev));
                 break;
         default:
                 ctcm_pr_warn("unknown error %ld on device %s\n",
-                                PTR_ERR(irb), cdev->dev.bus_id);
+                                PTR_ERR(irb), dev_name(&cdev->dev));
         }
         return PTR_ERR(irb);
 }
@@ -1182,7 +1182,7 @@ static void ctcm_irq_handler(struct ccw_device *cdev,
         int dstat;
 
         CTCM_DBF_TEXT_(TRACE, CTC_DBF_DEBUG,
-                "Enter %s(%s)", CTCM_FUNTAIL, &cdev->dev.bus_id);
+                "Enter %s(%s)", CTCM_FUNTAIL, dev_name(&cdev->dev));
 
         if (ctcm_check_irb_error(cdev, irb))
                 return;
@@ -1208,14 +1208,14 @@ static void ctcm_irq_handler(struct ccw_device *cdev,
                 ch = priv->channel[WRITE];
         else {
                 ctcm_pr_err("ctcm: Can't determine channel for interrupt, "
-                           "device %s\n", cdev->dev.bus_id);
+                           "device %s\n", dev_name(&cdev->dev));
                 return;
         }
 
         dev = ch->netdev;
         if (dev == NULL) {
                 ctcm_pr_crit("ctcm: %s dev=NULL bus_id=%s, ch=0x%p\n",
-                                __func__, cdev->dev.bus_id, ch);
+                                __func__, dev_name(&cdev->dev), ch);
                 return;
         }
 
@@ -1329,7 +1329,7 @@ static int add_channel(struct ccw_device *cdev, enum channel_types type,
 
         CTCM_DBF_TEXT_(SETUP, CTC_DBF_INFO,
                 "%s(%s), type %d, proto %d",
-                        __func__, cdev->dev.bus_id,     type, priv->protocol);
+                        __func__, dev_name(&cdev->dev), type, priv->protocol);
 
         ch = kzalloc(sizeof(struct channel), GFP_KERNEL);
         if (ch == NULL)
@@ -1358,7 +1358,7 @@ static int add_channel(struct ccw_device *cdev, enum channel_types type,
                                         goto nomem_return;
 
         ch->cdev = cdev;
-        snprintf(ch->id, CTCM_ID_SIZE, "ch-%s", cdev->dev.bus_id);
+        snprintf(ch->id, CTCM_ID_SIZE, "ch-%s", dev_name(&cdev->dev));
         ch->type = type;
 
         /**
diff --git a/drivers/s390/net/ctcm_main.h b/drivers/s390/net/ctcm_main.h
index 8e10ee86a5ee..d77cce3fe4d4 100644
--- a/drivers/s390/net/ctcm_main.h
+++ b/drivers/s390/net/ctcm_main.h
@@ -104,7 +104,7 @@
 #define READ                    0
 #define WRITE                   1
 
-#define CTCM_ID_SIZE            BUS_ID_SIZE+3
+#define CTCM_ID_SIZE            20+3
 
 struct ctcm_profile {
         unsigned long maxmulti;
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 9bcfa04d863b..0825be87e5a0 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -492,7 +492,7 @@ lcs_start_channel(struct lcs_channel *channel)
         unsigned long flags;
         int rc;
 
-        LCS_DBF_TEXT_(4,trace,"ssch%s", channel->ccwdev->dev.bus_id);
+        LCS_DBF_TEXT_(4, trace,"ssch%s", dev_name(&channel->ccwdev->dev));
         spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags);
         rc = ccw_device_start(channel->ccwdev,
                               channel->ccws + channel->io_idx, 0, 0,
@@ -501,7 +501,8 @@ lcs_start_channel(struct lcs_channel *channel)
                 channel->state = LCS_CH_STATE_RUNNING;
         spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);
         if (rc) {
-                LCS_DBF_TEXT_(4,trace,"essh%s", channel->ccwdev->dev.bus_id);
+                LCS_DBF_TEXT_(4,trace,"essh%s",
+                              dev_name(&channel->ccwdev->dev));
                 PRINT_ERR("Error in starting channel, rc=%d!\n", rc);
         }
         return rc;
@@ -514,12 +515,13 @@ lcs_clear_channel(struct lcs_channel *channel)
         int rc;
 
         LCS_DBF_TEXT(4,trace,"clearch");
-        LCS_DBF_TEXT_(4,trace,"%s", channel->ccwdev->dev.bus_id);
+        LCS_DBF_TEXT_(4, trace, "%s", dev_name(&channel->ccwdev->dev));
         spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags);
         rc = ccw_device_clear(channel->ccwdev, (addr_t) channel);
         spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);
         if (rc) {
-                LCS_DBF_TEXT_(4,trace,"ecsc%s", channel->ccwdev->dev.bus_id);
+                LCS_DBF_TEXT_(4, trace, "ecsc%s",
+                              dev_name(&channel->ccwdev->dev));
                 return rc;
         }
         wait_event(channel->wait_q, (channel->state == LCS_CH_STATE_CLEARED));
@@ -540,13 +542,14 @@ lcs_stop_channel(struct lcs_channel *channel)
         if (channel->state == LCS_CH_STATE_STOPPED)
                 return 0;
         LCS_DBF_TEXT(4,trace,"haltsch");
-        LCS_DBF_TEXT_(4,trace,"%s", channel->ccwdev->dev.bus_id);
+        LCS_DBF_TEXT_(4, trace, "%s", dev_name(&channel->ccwdev->dev));
         channel->state = LCS_CH_STATE_INIT;
         spin_lock_irqsave(get_ccwdev_lock(channel->ccwdev), flags);
         rc = ccw_device_halt(channel->ccwdev, (addr_t) channel);
         spin_unlock_irqrestore(get_ccwdev_lock(channel->ccwdev), flags);
         if (rc) {
-                LCS_DBF_TEXT_(4,trace,"ehsc%s", channel->ccwdev->dev.bus_id);
+                LCS_DBF_TEXT_(4, trace, "ehsc%s",
+                              dev_name(&channel->ccwdev->dev));
                 return rc;
         }
         /* Asynchronous halt initialted. Wait for its completion. */
@@ -632,10 +635,11 @@ __lcs_resume_channel(struct lcs_channel *channel)
                 return 0;
         if (channel->ccws[channel->io_idx].flags & CCW_FLAG_SUSPEND)
                 return 0;
-        LCS_DBF_TEXT_(5, trace, "rsch%s", channel->ccwdev->dev.bus_id);
+        LCS_DBF_TEXT_(5, trace, "rsch%s", dev_name(&channel->ccwdev->dev));
         rc = ccw_device_resume(channel->ccwdev);
         if (rc) {
-                LCS_DBF_TEXT_(4, trace, "ersc%s", channel->ccwdev->dev.bus_id);
+                LCS_DBF_TEXT_(4, trace, "ersc%s",
+                              dev_name(&channel->ccwdev->dev));
                 PRINT_ERR("Error in lcs_resume_channel: rc=%d\n",rc);
         } else
                 channel->state = LCS_CH_STATE_RUNNING;
@@ -1302,18 +1306,18 @@ lcs_check_irb_error(struct ccw_device *cdev, struct irb *irb)
 
         switch (PTR_ERR(irb)) {
         case -EIO:
-                PRINT_WARN("i/o-error on device %s\n", cdev->dev.bus_id);
+                PRINT_WARN("i/o-error on device %s\n", dev_name(&cdev->dev));
                 LCS_DBF_TEXT(2, trace, "ckirberr");
                 LCS_DBF_TEXT_(2, trace, "  rc%d", -EIO);
                 break;
         case -ETIMEDOUT:
-                PRINT_WARN("timeout on device %s\n", cdev->dev.bus_id);
+                PRINT_WARN("timeout on device %s\n", dev_name(&cdev->dev));
                 LCS_DBF_TEXT(2, trace, "ckirberr");
                 LCS_DBF_TEXT_(2, trace, "  rc%d", -ETIMEDOUT);
                 break;
         default:
                 PRINT_WARN("unknown error %ld on device %s\n", PTR_ERR(irb),
-                           cdev->dev.bus_id);
+                           dev_name(&cdev->dev));
                 LCS_DBF_TEXT(2, trace, "ckirberr");
                 LCS_DBF_TEXT(2, trace, "  rc???");
         }
@@ -1390,7 +1394,7 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
 
         cstat = irb->scsw.cmd.cstat;
         dstat = irb->scsw.cmd.dstat;
-        LCS_DBF_TEXT_(5, trace, "Rint%s",cdev->dev.bus_id);
+        LCS_DBF_TEXT_(5, trace, "Rint%s", dev_name(&cdev->dev));
         LCS_DBF_TEXT_(5, trace, "%4x%4x", irb->scsw.cmd.cstat,
                       irb->scsw.cmd.dstat);
         LCS_DBF_TEXT_(5, trace, "%4x%4x", irb->scsw.cmd.fctl,
@@ -1400,7 +1404,7 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         rc = lcs_get_problem(cdev, irb);
         if (rc || (dstat & DEV_STAT_UNIT_EXCEP)) {
                 PRINT_WARN("check on device %s, dstat=0x%X, cstat=0x%X \n",
-                            cdev->dev.bus_id, dstat, cstat);
+                            dev_name(&cdev->dev), dstat, cstat);
                 if (rc) {
                         channel->state = LCS_CH_STATE_ERROR;
                 }
@@ -1463,7 +1467,7 @@ lcs_tasklet(unsigned long data)
         int rc;
 
         channel = (struct lcs_channel *) data;
-        LCS_DBF_TEXT_(5, trace, "tlet%s",channel->ccwdev->dev.bus_id);
+        LCS_DBF_TEXT_(5, trace, "tlet%s", dev_name(&channel->ccwdev->dev));
 
         /* Check for processed buffers. */
         iob = channel->iob;
@@ -2244,7 +2248,7 @@ lcs_recovery(void *ptr)
                 return 0;
         LCS_DBF_TEXT(4, trace, "recover2");
         gdev = card->gdev;
-        PRINT_WARN("Recovery of device %s started...\n", gdev->dev.bus_id);
+        PRINT_WARN("Recovery of device %s started...\n", dev_name(&gdev->dev));
         rc = __lcs_shutdown_device(gdev, 1);
         rc = lcs_new_device(gdev);
         if (!rc)
diff --git a/drivers/s390/net/qeth_core.h b/drivers/s390/net/qeth_core.h
index bf8a75c92f28..af6d60458513 100644
--- a/drivers/s390/net/qeth_core.h
+++ b/drivers/s390/net/qeth_core.h
@@ -90,11 +90,11 @@ struct qeth_dbf_info {
 #define CARD_RDEV(card) card->read.ccwdev
 #define CARD_WDEV(card) card->write.ccwdev
 #define CARD_DDEV(card) card->data.ccwdev
-#define CARD_BUS_ID(card) card->gdev->dev.bus_id
-#define CARD_RDEV_ID(card) card->read.ccwdev->dev.bus_id
-#define CARD_WDEV_ID(card) card->write.ccwdev->dev.bus_id
-#define CARD_DDEV_ID(card) card->data.ccwdev->dev.bus_id
-#define CHANNEL_ID(channel) channel->ccwdev->dev.bus_id
+#define CARD_BUS_ID(card) dev_name(&card->gdev->dev)
+#define CARD_RDEV_ID(card) dev_name(&card->read.ccwdev->dev)
+#define CARD_WDEV_ID(card) dev_name(&card->write.ccwdev->dev)
+#define CARD_DDEV_ID(card) dev_name(&card->data.ccwdev->dev)
+#define CHANNEL_ID(channel) dev_name(&channel->ccwdev->dev)
 
 /**
  * card stuff
diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index c7ab1b864516..141b2bb7b3cf 100644
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -745,7 +745,7 @@ static int qeth_get_problem(struct ccw_device *cdev, struct irb *irb)
                      SCHN_STAT_PROT_CHECK | SCHN_STAT_PROG_CHECK)) {
                 QETH_DBF_TEXT(TRACE, 2, "CGENCHK");
                 PRINT_WARN("check on device %s, dstat=x%x, cstat=x%x ",
-                           cdev->dev.bus_id, dstat, cstat);
+                           dev_name(&cdev->dev), dstat, cstat);
                 print_hex_dump(KERN_WARNING, "qeth: irb ", DUMP_PREFIX_OFFSET,
                                 16, 1, irb, 64, 1);
                 return 1;
@@ -784,12 +784,12 @@ static long __qeth_check_irb_error(struct ccw_device *cdev,
 
         switch (PTR_ERR(irb)) {
         case -EIO:
-                PRINT_WARN("i/o-error on device %s\n", cdev->dev.bus_id);
+                PRINT_WARN("i/o-error on device %s\n", dev_name(&cdev->dev));
                 QETH_DBF_TEXT(TRACE, 2, "ckirberr");
                 QETH_DBF_TEXT_(TRACE, 2, "  rc%d", -EIO);
                 break;
         case -ETIMEDOUT:
-                PRINT_WARN("timeout on device %s\n", cdev->dev.bus_id);
+                PRINT_WARN("timeout on device %s\n", dev_name(&cdev->dev));
                 QETH_DBF_TEXT(TRACE, 2, "ckirberr");
                 QETH_DBF_TEXT_(TRACE, 2, "  rc%d", -ETIMEDOUT);
                 if (intparm == QETH_RCD_PARM) {
@@ -803,7 +803,7 @@ static long __qeth_check_irb_error(struct ccw_device *cdev,
                 break;
         default:
                 PRINT_WARN("unknown error %ld on device %s\n", PTR_ERR(irb),
-                           cdev->dev.bus_id);
+                           dev_name(&cdev->dev));
                 QETH_DBF_TEXT(TRACE, 2, "ckirberr");
                 QETH_DBF_TEXT(TRACE, 2, "  rc???");
         }
@@ -4081,7 +4081,7 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)
         if (!get_device(dev))
                 return -ENODEV;
 
-        QETH_DBF_TEXT_(SETUP, 2, "%s", gdev->dev.bus_id);
+        QETH_DBF_TEXT_(SETUP, 2, "%s", dev_name(&gdev->dev));
 
         card = qeth_alloc_card();
         if (!card) {