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

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index bf512ac75b9e..892e2878d61b 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -309,7 +309,8 @@ static void dasd_eer_write_standard_trigger(struct dasd_device *device,
         do_gettimeofday(&tv);
         header.tv_sec = tv.tv_sec;
         header.tv_usec = tv.tv_usec;
-        strncpy(header.busid, device->cdev->dev.bus_id, DASD_EER_BUSID_SIZE);
+        strncpy(header.busid, dev_name(&device->cdev->dev),
+                DASD_EER_BUSID_SIZE);
 
         spin_lock_irqsave(&bufferlock, flags);
         list_for_each_entry(eerb, &bufferlist, list) {
@@ -349,7 +350,8 @@ static void dasd_eer_write_snss_trigger(struct dasd_device *device,
         do_gettimeofday(&tv);
         header.tv_sec = tv.tv_sec;
         header.tv_usec = tv.tv_usec;
-        strncpy(header.busid, device->cdev->dev.bus_id, DASD_EER_BUSID_SIZE);
+        strncpy(header.busid, dev_name(&device->cdev->dev),
+                DASD_EER_BUSID_SIZE);
 
         spin_lock_irqsave(&bufferlock, flags);
         list_for_each_entry(eerb, &bufferlist, list) {