[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>

5 files changed, 16 insertions, 14 deletions

diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 9a50f245774b..e17b462ace03 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -270,7 +270,7 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id,
         }
 
         snprintf (gdev->dev.bus_id, BUS_ID_SIZE, "%s",
-                        gdev->cdev[0]->dev.bus_id);
+                        dev_name(&gdev->cdev[0]->dev));
 
         rc = device_add(&gdev->dev);
         if (rc)
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 326f4cc7f92c..8759912734e0 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -153,7 +153,7 @@ cio_start_handle_notoper(struct subchannel *sch, __u8 lpm)
         CIO_MSG_EVENT(2, "cio_start: 'not oper' status for "
                       "subchannel 0.%x.%04x!\n", sch->schid.ssid,
                       sch->schid.sch_no);
-        sprintf(dbf_text, "no%s", sch->dev.bus_id);
+        sprintf(dbf_text, "no%s", dev_name(&sch->dev));
         CIO_TRACE_EVENT(0, dbf_text);
         CIO_HEX_EVENT(0, &sch->schib, sizeof (struct schib));
 
@@ -171,7 +171,7 @@ cio_start_key (struct subchannel *sch,	/* subchannel structure */
         union orb *orb;
 
         CIO_TRACE_EVENT(4, "stIO");
-        CIO_TRACE_EVENT(4, sch->dev.bus_id);
+        CIO_TRACE_EVENT(4, dev_name(&sch->dev));
 
         orb = &to_io_private(sch)->orb;
         memset(orb, 0, sizeof(union orb));
@@ -232,7 +232,7 @@ cio_resume (struct subchannel *sch)
         int ccode;
 
         CIO_TRACE_EVENT (4, "resIO");
-        CIO_TRACE_EVENT (4, sch->dev.bus_id);
+        CIO_TRACE_EVENT(4, dev_name(&sch->dev));
 
         ccode = rsch (sch->schid);
 
@@ -269,7 +269,7 @@ cio_halt(struct subchannel *sch)
                 return -ENODEV;
 
         CIO_TRACE_EVENT (2, "haltIO");
-        CIO_TRACE_EVENT (2, sch->dev.bus_id);
+        CIO_TRACE_EVENT(2, dev_name(&sch->dev));
 
         /*
          * Issue "Halt subchannel" and process condition code
@@ -304,7 +304,7 @@ cio_clear(struct subchannel *sch)
                 return -ENODEV;
 
         CIO_TRACE_EVENT (2, "clearIO");
-        CIO_TRACE_EVENT (2, sch->dev.bus_id);
+        CIO_TRACE_EVENT(2, dev_name(&sch->dev));
 
         /*
          * Issue "Clear subchannel" and process condition code
@@ -340,7 +340,7 @@ cio_cancel (struct subchannel *sch)
                 return -ENODEV;
 
         CIO_TRACE_EVENT (2, "cancelIO");
-        CIO_TRACE_EVENT (2, sch->dev.bus_id);
+        CIO_TRACE_EVENT(2, dev_name(&sch->dev));
 
         ccode = xsch (sch->schid);
 
@@ -404,7 +404,7 @@ int cio_enable_subchannel(struct subchannel *sch, u32 intparm)
         int ret;
 
         CIO_TRACE_EVENT (2, "ensch");
-        CIO_TRACE_EVENT (2, sch->dev.bus_id);
+        CIO_TRACE_EVENT(2, dev_name(&sch->dev));
 
         if (sch_is_pseudo_sch(sch))
                 return -EINVAL;
@@ -454,7 +454,7 @@ int cio_disable_subchannel(struct subchannel *sch)
         int ret;
 
         CIO_TRACE_EVENT (2, "dissch");
-        CIO_TRACE_EVENT (2, sch->dev.bus_id);
+        CIO_TRACE_EVENT(2, dev_name(&sch->dev));
 
         if (sch_is_pseudo_sch(sch))
                 return 0;
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 8575d263b13e..95b92dfec5a8 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1101,7 +1101,7 @@ static void io_subchannel_irq(struct subchannel *sch)
         cdev = sch_get_cdev(sch);
 
         CIO_TRACE_EVENT(3, "IRQ");
-        CIO_TRACE_EVENT(3, sch->dev.bus_id);
+        CIO_TRACE_EVENT(3, dev_name(&sch->dev));
         if (cdev)
                 dev_fsm_event(cdev, DEV_EVENT_INTERRUPT);
 }
@@ -1707,7 +1707,7 @@ __ccwdev_check_busid(struct device *dev, void *id)
 
         bus_id = id;
 
-        return (strncmp(bus_id, dev->bus_id, BUS_ID_SIZE) == 0);
+        return (strncmp(bus_id, dev_name(dev), BUS_ID_SIZE) == 0);
 }
 
 
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 84cc9ea346db..10bc03940fb3 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -52,8 +52,10 @@ static void ccw_timeout_log(struct ccw_device *cdev)
         printk(KERN_WARNING "cio: orb:\n");
         print_hex_dump(KERN_WARNING, "cio:  ", DUMP_PREFIX_NONE, 16, 1,
                        orb, sizeof(*orb), 0);
-        printk(KERN_WARNING "cio: ccw device bus id: %s\n", cdev->dev.bus_id);
-        printk(KERN_WARNING "cio: subchannel bus id: %s\n", sch->dev.bus_id);
+        printk(KERN_WARNING "cio: ccw device bus id: %s\n",
+               dev_name(&cdev->dev));
+        printk(KERN_WARNING "cio: subchannel bus id: %s\n",
+               dev_name(&sch->dev));
         printk(KERN_WARNING "cio: subchannel lpm: %02x, opm: %02x, "
                "vpm: %02x\n", sch->lpm, sch->opm, sch->vpm);
 
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index ee1a28310fbb..eabcc42d63df 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -498,7 +498,7 @@ ccw_device_stlck(struct ccw_device *cdev)
         sch = to_subchannel(cdev->dev.parent);
         
         CIO_TRACE_EVENT(2, "stl lock");
-        CIO_TRACE_EVENT(2, cdev->dev.bus_id);
+        CIO_TRACE_EVENT(2, dev_name(&cdev->dev));
 
         buf = kmalloc(32*sizeof(char), GFP_DMA|GFP_KERNEL);
         if (!buf)