[S390] bus_id -> dev_name conversions

[linux-2.6-omap-h63xx.git] / drivers / s390 / net / claw.c

diff --git a/drivers/s390/net/claw.c b/drivers/s390/net/claw.c
index e10ac9ab2d4477cbfda1d4ada3fd841ac56bb4f4..26e95858a8f929d92c8b66fb1e5766db93fd5d97 100644 (file)
--- 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);