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

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index acb78017e7d0fd2e2988bfed85ec484e527bfcc6..0a225ccda026017773e1a619fc07c651c7223aef 100644 (file)
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -215,7 +215,7 @@ static int dasd_state_known_to_basic(struct dasd_device *device)
                        return rc;
        }
        /* register 'device' debug area, used for all DBF_DEV_XXX calls */
-       device->debug_area = debug_register(device->cdev->dev.bus_id, 1, 1,
+       device->debug_area = debug_register(dev_name(&device->cdev->dev), 1, 1,
                                            8 * sizeof(long));
        debug_register_view(device->debug_area, &debug_sprintf_view);
        debug_set_level(device->debug_area, DBF_WARNING);
@@ -933,7 +933,7 @@ static void dasd_handle_killed_request(struct ccw_device *cdev,
                MESSAGE(KERN_DEBUG,
                        "invalid status in handle_killed_request: "
                        "bus_id %s, status %02x",
-                       cdev->dev.bus_id, cqr->status);
+                       dev_name(&cdev->dev), cqr->status);
                return;
        }
 
@@ -942,7 +942,7 @@ static void dasd_handle_killed_request(struct ccw_device *cdev,
            device != dasd_device_from_cdev_locked(cdev) ||
            strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) {
                MESSAGE(KERN_DEBUG, "invalid device in request: bus_id %s",
-                       cdev->dev.bus_id);
+                       dev_name(&cdev->dev));
                return;
        }
 
@@ -982,11 +982,11 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
                        break;
                case -ETIMEDOUT:
                        printk(KERN_WARNING"%s(%s): request timed out\n",
-                              __func__, cdev->dev.bus_id);
+                              __func__, dev_name(&cdev->dev));
                        break;
                default:
                        printk(KERN_WARNING"%s(%s): unknown error %ld\n",
-                              __func__, cdev->dev.bus_id, PTR_ERR(irb));
+                              __func__, dev_name(&cdev->dev), PTR_ERR(irb));
                }
                dasd_handle_killed_request(cdev, intparm);
                return;
@@ -995,7 +995,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
        now = get_clock();
 
        DBF_EVENT(DBF_ERR, "Interrupt: bus_id %s CS/DS %04x ip %08x",
-                 cdev->dev.bus_id, ((irb->scsw.cmd.cstat << 8) |
+                 dev_name(&cdev->dev), ((irb->scsw.cmd.cstat << 8) |
                  irb->scsw.cmd.dstat), (unsigned int) intparm);
 
        /* check for unsolicited interrupts */
@@ -1019,7 +1019,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
        if (!device ||
            strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) {
                MESSAGE(KERN_DEBUG, "invalid device in request: bus_id %s",
-                       cdev->dev.bus_id);
+                       dev_name(&cdev->dev));
                return;
        }
 
@@ -1037,7 +1037,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
        if (cqr->status != DASD_CQR_IN_IO) {
                MESSAGE(KERN_DEBUG,
                        "invalid status: bus_id %s, status %02x",
-                       cdev->dev.bus_id, cqr->status);
+                       dev_name(&cdev->dev), cqr->status);
                return;
        }
        DBF_DEV_EVENT(DBF_DEBUG, device, "Int: CS/DS 0x%04x for cqr %p",
@@ -2134,14 +2134,14 @@ int dasd_generic_probe(struct ccw_device *cdev,
        if (ret) {
                printk(KERN_WARNING
                       "dasd_generic_probe: could not set ccw-device options "
-                      "for %s\n", cdev->dev.bus_id);
+                      "for %s\n", dev_name(&cdev->dev));
                return ret;
        }
        ret = dasd_add_sysfs_files(cdev);
        if (ret) {
                printk(KERN_WARNING
                       "dasd_generic_probe: could not add sysfs entries "
-                      "for %s\n", cdev->dev.bus_id);
+                      "for %s\n", dev_name(&cdev->dev));
                return ret;
        }
        cdev->handler = &dasd_int_handler;
@@ -2152,13 +2152,13 @@ int dasd_generic_probe(struct ccw_device *cdev,
         * initial probe.
         */
        if ((dasd_get_feature(cdev, DASD_FEATURE_INITIAL_ONLINE) > 0 ) ||
-           (dasd_autodetect && dasd_busid_known(cdev->dev.bus_id) != 0))
+           (dasd_autodetect && dasd_busid_known(dev_name(&cdev->dev)) != 0))
                ret = ccw_device_set_online(cdev);
        if (ret)
                printk(KERN_WARNING
                       "dasd_generic_probe: could not initially "
                       "online ccw-device %s; return code: %d\n",
-                      cdev->dev.bus_id, ret);
+                      dev_name(&cdev->dev), ret);
        return 0;
 }
 
@@ -2224,7 +2224,7 @@ int dasd_generic_set_online(struct ccw_device *cdev,
                        printk (KERN_WARNING
                                "dasd_generic couldn't online device %s "
                                "- discipline DIAG not available\n",
-                               cdev->dev.bus_id);
+                               dev_name(&cdev->dev));
                        dasd_delete_device(device);
                        return -ENODEV;
                }
@@ -2248,7 +2248,7 @@ int dasd_generic_set_online(struct ccw_device *cdev,
                printk (KERN_WARNING
                        "dasd_generic couldn't online device %s "
                        "with discipline %s rc=%i\n",
-                       cdev->dev.bus_id, discipline->name, rc);
+                       dev_name(&cdev->dev), discipline->name, rc);
                module_put(discipline->owner);
                module_put(base_discipline->owner);
                dasd_delete_device(device);
@@ -2259,7 +2259,7 @@ int dasd_generic_set_online(struct ccw_device *cdev,
        if (device->state <= DASD_STATE_KNOWN) {
                printk (KERN_WARNING
                        "dasd_generic discipline not found for %s\n",
-                       cdev->dev.bus_id);
+                       dev_name(&cdev->dev));
                rc = -ENODEV;
                dasd_set_target_state(device, DASD_STATE_NEW);
                if (device->block)
@@ -2267,7 +2267,7 @@ int dasd_generic_set_online(struct ccw_device *cdev,
                dasd_delete_device(device);
        } else
                pr_debug("dasd_generic device %s found\n",
-                               cdev->dev.bus_id);
+                               dev_name(&cdev->dev));
 
        /* FIXME: we have to wait for the root device but we don't want
         * to wait for each single device but for all at once. */

diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index 5c6e6f331cb0691e097f55321eb5fe37007adbb3..b8f9c00633f3adfb6885daedbb04031c1b925877 100644 (file)
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -1397,7 +1397,7 @@ static struct dasd_ccw_req *dasd_3990_erp_inspect_alias(
                        DEV_MESSAGE(KERN_ERR, cqr->startdev,
                                    "ERP on alias device for request %p,"
                                    " recover on base device %s", cqr,
-                                   cqr->block->base->cdev->dev.bus_id);
+                                   dev_name(&cqr->block->base->cdev->dev));
                }
                dasd_eckd_reset_ccw_to_base_io(cqr);
                erp->startdev = cqr->block->base;

diff --git a/drivers/s390/block/dasd_devmap.c b/drivers/s390/block/dasd_devmap.c
index cd3335c1c307e1b642c87fbb0873c76a8fdac820..921443b01d163165bcf20b50e81d9baceb785f34 100644 (file)
--- a/drivers/s390/block/dasd_devmap.c
+++ b/drivers/s390/block/dasd_devmap.c
@@ -515,9 +515,9 @@ dasd_devmap_from_cdev(struct ccw_device *cdev)
 {
        struct dasd_devmap *devmap;
 
-       devmap = dasd_find_busid(cdev->dev.bus_id);
+       devmap = dasd_find_busid(dev_name(&cdev->dev));
        if (IS_ERR(devmap))
-               devmap = dasd_add_busid(cdev->dev.bus_id,
+               devmap = dasd_add_busid(dev_name(&cdev->dev),
                                        DASD_FEATURE_DEFAULT);
        return devmap;
 }
@@ -584,7 +584,7 @@ dasd_delete_device(struct dasd_device *device)
        unsigned long flags;
 
        /* First remove device pointer from devmap. */
-       devmap = dasd_find_busid(device->cdev->dev.bus_id);
+       devmap = dasd_find_busid(dev_name(&device->cdev->dev));
        BUG_ON(IS_ERR(devmap));
        spin_lock(&dasd_devmap_lock);
        if (devmap->device != device) {
@@ -674,7 +674,7 @@ dasd_ro_show(struct device *dev, struct device_attribute *attr, char *buf)
        struct dasd_devmap *devmap;
        int ro_flag;
 
-       devmap = dasd_find_busid(dev->bus_id);
+       devmap = dasd_find_busid(dev_name(dev));
        if (!IS_ERR(devmap))
                ro_flag = (devmap->features & DASD_FEATURE_READONLY) != 0;
        else
@@ -723,7 +723,7 @@ dasd_erplog_show(struct device *dev, struct device_attribute *attr, char *buf)
        struct dasd_devmap *devmap;
        int erplog;
 
-       devmap = dasd_find_busid(dev->bus_id);
+       devmap = dasd_find_busid(dev_name(dev));
        if (!IS_ERR(devmap))
                erplog = (devmap->features & DASD_FEATURE_ERPLOG) != 0;
        else
@@ -770,7 +770,7 @@ dasd_use_diag_show(struct device *dev, struct device_attribute *attr, char *buf)
        struct dasd_devmap *devmap;
        int use_diag;
 
-       devmap = dasd_find_busid(dev->bus_id);
+       devmap = dasd_find_busid(dev_name(dev));
        if (!IS_ERR(devmap))
                use_diag = (devmap->features & DASD_FEATURE_USEDIAG) != 0;
        else
@@ -876,7 +876,7 @@ dasd_alias_show(struct device *dev, struct device_attribute *attr, char *buf)
        struct dasd_devmap *devmap;
        int alias;
 
-       devmap = dasd_find_busid(dev->bus_id);
+       devmap = dasd_find_busid(dev_name(dev));
        spin_lock(&dasd_devmap_lock);
        if (IS_ERR(devmap) || strlen(devmap->uid.vendor) == 0) {
                spin_unlock(&dasd_devmap_lock);
@@ -899,7 +899,7 @@ dasd_vendor_show(struct device *dev, struct device_attribute *attr, char *buf)
        struct dasd_devmap *devmap;
        char *vendor;
 
-       devmap = dasd_find_busid(dev->bus_id);
+       devmap = dasd_find_busid(dev_name(dev));
        spin_lock(&dasd_devmap_lock);
        if (!IS_ERR(devmap) && strlen(devmap->uid.vendor) > 0)
                vendor = devmap->uid.vendor;
@@ -924,7 +924,7 @@ dasd_uid_show(struct device *dev, struct device_attribute *attr, char *buf)
        char ua_string[3];
        struct dasd_uid *uid;
 
-       devmap = dasd_find_busid(dev->bus_id);
+       devmap = dasd_find_busid(dev_name(dev));
        spin_lock(&dasd_devmap_lock);
        if (IS_ERR(devmap) || strlen(devmap->uid.vendor) == 0) {
                spin_unlock(&dasd_devmap_lock);
@@ -972,7 +972,7 @@ dasd_eer_show(struct device *dev, struct device_attribute *attr, char *buf)
        struct dasd_devmap *devmap;
        int eer_flag;
 
-       devmap = dasd_find_busid(dev->bus_id);
+       devmap = dasd_find_busid(dev_name(dev));
        if (!IS_ERR(devmap) && devmap->device)
                eer_flag = dasd_eer_enabled(devmap->device);
        else
@@ -1034,7 +1034,7 @@ dasd_get_uid(struct ccw_device *cdev, struct dasd_uid *uid)
 {
        struct dasd_devmap *devmap;
 
-       devmap = dasd_find_busid(cdev->dev.bus_id);
+       devmap = dasd_find_busid(dev_name(&cdev->dev));
        if (IS_ERR(devmap))
                return PTR_ERR(devmap);
        spin_lock(&dasd_devmap_lock);
@@ -1057,7 +1057,7 @@ dasd_set_uid(struct ccw_device *cdev, struct dasd_uid *uid)
 {
        struct dasd_devmap *devmap;
 
-       devmap = dasd_find_busid(cdev->dev.bus_id);
+       devmap = dasd_find_busid(dev_name(&cdev->dev));
        if (IS_ERR(devmap))
                return PTR_ERR(devmap);
 
@@ -1077,7 +1077,7 @@ dasd_get_feature(struct ccw_device *cdev, int feature)
 {
        struct dasd_devmap *devmap;
 
-       devmap = dasd_find_busid(cdev->dev.bus_id);
+       devmap = dasd_find_busid(dev_name(&cdev->dev));
        if (IS_ERR(devmap))
                return PTR_ERR(devmap);
 
@@ -1093,7 +1093,7 @@ dasd_set_feature(struct ccw_device *cdev, int feature, int flag)
 {
        struct dasd_devmap *devmap;
 
-       devmap = dasd_find_busid(cdev->dev.bus_id);
+       devmap = dasd_find_busid(dev_name(&cdev->dev));
        if (IS_ERR(devmap))
                return PTR_ERR(devmap);
 

diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index 773b3fe275b239b08968c6a7e72e1356bf06674e..72d3970f11a4bd4e7913053ed814b51bd8486ff1 100644 (file)
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -84,7 +84,7 @@ dasd_eckd_probe (struct ccw_device *cdev)
        if (ret) {
                printk(KERN_WARNING
                       "dasd_eckd_probe: could not set ccw-device options "
-                      "for %s\n", cdev->dev.bus_id);
+                      "for %s\n", dev_name(&cdev->dev));
                return ret;
        }
        ret = dasd_generic_probe(cdev, &dasd_eckd_discipline);
@@ -2145,13 +2145,13 @@ static void dasd_eckd_dump_sense(struct dasd_device *device,
        /* dump the sense data */
        len = sprintf(page,  KERN_ERR PRINTK_HEADER
                      " I/O status report for device %s:\n",
-                     device->cdev->dev.bus_id);
+                     dev_name(&device->cdev->dev));
        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                       " in req: %p CS: 0x%02X DS: 0x%02X\n", req,
                       irb->scsw.cmd.cstat, irb->scsw.cmd.dstat);
        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                       " device %s: Failing CCW: %p\n",
-                      device->cdev->dev.bus_id,
+                      dev_name(&device->cdev->dev),
                       (void *) (addr_t) irb->scsw.cmd.cpa);
        if (irb->esw.esw0.erw.cons) {
                for (sl = 0; sl < 4; sl++) {

diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index bf512ac75b9e640f058cf1d1b8ddbd2d9490134a..892e2878d61b94a41ad036a750077a43c158db10 100644 (file)
--- 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) {

diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index aa0c533423a5f040d96e9d5c6f275787a7a9f21c..93d9b6452a94b5fb2e6606ed9efe92fffce72888 100644 (file)
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -451,13 +451,13 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
        }
        len = sprintf(page, KERN_ERR PRINTK_HEADER
                      " I/O status report for device %s:\n",
-                     device->cdev->dev.bus_id);
+                     dev_name(&device->cdev->dev));
        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                       " in req: %p CS: 0x%02X DS: 0x%02X\n", req,
                       irb->scsw.cmd.cstat, irb->scsw.cmd.dstat);
        len += sprintf(page + len, KERN_ERR PRINTK_HEADER
                       " device %s: Failing CCW: %p\n",
-                      device->cdev->dev.bus_id,
+                      dev_name(&device->cdev->dev),
                       (void *) (addr_t) irb->scsw.cmd.cpa);
        if (irb->esw.esw0.erw.cons) {
                for (sl = 0; sl < 4; sl++) {

diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h
index 31ecaa4a40e42498661397e7459dad2dd75897f5..489d5fe488fb7d60616caebf36e78360ec4cfdd8 100644 (file)
--- a/drivers/s390/block/dasd_int.h
+++ b/drivers/s390/block/dasd_int.h
@@ -126,7 +126,7 @@ do { \
 #define DEV_MESSAGE(d_loglevel,d_device,d_string,d_args...)\
 do { \
        printk(d_loglevel PRINTK_HEADER " %s: " d_string "\n", \
-              d_device->cdev->dev.bus_id, d_args); \
+              dev_name(&d_device->cdev->dev), d_args); \
        DBF_DEV_EVENT(DBF_ALERT, d_device, d_string, d_args); \
 } while(0)
 
@@ -140,7 +140,7 @@ do { \
 #define DEV_MESSAGE_LOG(d_loglevel,d_device,d_string,d_args...)\
 do { \
        printk(d_loglevel PRINTK_HEADER " %s: " d_string "\n", \
-              d_device->cdev->dev.bus_id, d_args); \
+              dev_name(&d_device->cdev->dev), d_args); \
 } while(0)
 
 #define MESSAGE_LOG(d_loglevel,d_string,d_args...)\

diff --git a/drivers/s390/block/dasd_proc.c b/drivers/s390/block/dasd_proc.c
index e3b5c4d3036e693ec0f5b7601bbf681c06f9aaea..9088de84b45de867fd845478ac97b3b5c18bf543 100644 (file)
--- a/drivers/s390/block/dasd_proc.c
+++ b/drivers/s390/block/dasd_proc.c
@@ -67,7 +67,7 @@ dasd_devices_show(struct seq_file *m, void *v)
                return 0;
        }
        /* Print device number. */
-       seq_printf(m, "%s", device->cdev->dev.bus_id);
+       seq_printf(m, "%s", dev_name(&device->cdev->dev));
        /* Print discipline string. */
        if (device != NULL && device->discipline != NULL)
                seq_printf(m, "(%s)", device->discipline->name);

diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 9481e4a3f76ee39cdf2aa9a0f543a831792b6cbd..2aca79e952b0b28e5cba729a90cd1756b4990905 100644 (file)
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -91,7 +91,7 @@ static struct rw_semaphore dcssblk_devices_sem;
 static void
 dcssblk_release_segment(struct device *dev)
 {
-       PRINT_DEBUG("segment release fn called for %s\n", dev->bus_id);
+       PRINT_DEBUG("segment release fn called for %s\n", dev_name(dev));
        kfree(container_of(dev, struct dcssblk_dev_info, dev));
        module_put(THIS_MODULE);
 }
@@ -602,7 +602,8 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio)
                case SEG_TYPE_SC:
                        /* cannot write to these segments */
                        if (bio_data_dir(bio) == WRITE) {
-                               PRINT_WARN("rejecting write to ro segment %s\n", dev_info->dev.bus_id);
+                               PRINT_WARN("rejecting write to ro segment %s\n",
+                                          dev_name(&dev_info->dev));
                                goto fail;
                        }
                }

diff --git a/drivers/s390/char/tape_3590.c b/drivers/s390/char/tape_3590.c
index 839987618ffd8d545538626733b4c0ca1205c8ce..4005c44a404c47efbb33d8e177389ca4a0b01a28 100644 (file)
--- a/drivers/s390/char/tape_3590.c
+++ b/drivers/s390/char/tape_3590.c
@@ -910,7 +910,7 @@ tape_3590_erp_swap(struct tape_device *device, struct tape_request *request,
         * should proceed with the new tape... this
         * should probably be done in user space!
         */
-       PRINT_WARN("(%s): Swap Tape Device!\n", device->cdev->dev.bus_id);
+       PRINT_WARN("(%s): Swap Tape Device!\n", dev_name(&device->cdev->dev));
        return tape_3590_erp_basic(device, request, irb, -EIO);
 }
 
@@ -1003,40 +1003,43 @@ tape_3590_print_mim_msg_f0(struct tape_device *device, struct irb *irb)
        /* Exception Message */
        switch (sense->fmt.f70.emc) {
        case 0x02:
-               PRINT_WARN("(%s): Data degraded\n", device->cdev->dev.bus_id);
+               PRINT_WARN("(%s): Data degraded\n",
+                          dev_name(&device->cdev->dev));
                break;
        case 0x03:
                PRINT_WARN("(%s): Data degraded in partion %i\n",
-                          device->cdev->dev.bus_id, sense->fmt.f70.mp);
+                          dev_name(&device->cdev->dev), sense->fmt.f70.mp);
                break;
        case 0x04:
-               PRINT_WARN("(%s): Medium degraded\n", device->cdev->dev.bus_id);
+               PRINT_WARN("(%s): Medium degraded\n",
+                          dev_name(&device->cdev->dev));
                break;
        case 0x05:
                PRINT_WARN("(%s): Medium degraded in partition %i\n",
-                          device->cdev->dev.bus_id, sense->fmt.f70.mp);
+                          dev_name(&device->cdev->dev), sense->fmt.f70.mp);
                break;
        case 0x06:
-               PRINT_WARN("(%s): Block 0 Error\n", device->cdev->dev.bus_id);
+               PRINT_WARN("(%s): Block 0 Error\n",
+                          dev_name(&device->cdev->dev));
                break;
        case 0x07:
                PRINT_WARN("(%s): Medium Exception 0x%02x\n",
-                          device->cdev->dev.bus_id, sense->fmt.f70.md);
+                          dev_name(&device->cdev->dev), sense->fmt.f70.md);
                break;
        default:
                PRINT_WARN("(%s): MIM ExMsg: 0x%02x\n",
-                          device->cdev->dev.bus_id, sense->fmt.f70.emc);
+                          dev_name(&device->cdev->dev), sense->fmt.f70.emc);
                break;
        }
        /* Service Message */
        switch (sense->fmt.f70.smc) {
        case 0x02:
                PRINT_WARN("(%s): Reference Media maintenance procedure %i\n",
-                          device->cdev->dev.bus_id, sense->fmt.f70.md);
+                          dev_name(&device->cdev->dev), sense->fmt.f70.md);
                break;
        default:
                PRINT_WARN("(%s): MIM ServiceMsg: 0x%02x\n",
-                          device->cdev->dev.bus_id, sense->fmt.f70.smc);
+                          dev_name(&device->cdev->dev), sense->fmt.f70.smc);
                break;
        }
 }
@@ -1054,101 +1057,101 @@ tape_3590_print_io_sim_msg_f1(struct tape_device *device, struct irb *irb)
        switch (sense->fmt.f71.emc) {
        case 0x01:
                PRINT_WARN("(%s): Effect of failure is unknown\n",
-                          device->cdev->dev.bus_id);
+                          dev_name(&device->cdev->dev));
                break;
        case 0x02:
                PRINT_WARN("(%s): CU Exception - no performance impact\n",
-                          device->cdev->dev.bus_id);
+                          dev_name(&device->cdev->dev));
                break;
        case 0x03:
                PRINT_WARN("(%s): CU Exception on channel interface 0x%02x\n",
-                          device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                          dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                break;
        case 0x04:
                PRINT_WARN("(%s): CU Exception on device path 0x%02x\n",
-                          device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                          dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                break;
        case 0x05:
                PRINT_WARN("(%s): CU Exception on library path 0x%02x\n",
-                          device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                          dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                break;
        case 0x06:
                PRINT_WARN("(%s): CU Exception on node 0x%02x\n",
-                          device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                          dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                break;
        case 0x07:
                PRINT_WARN("(%s): CU Exception on partition 0x%02x\n",
-                          device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                          dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                break;
        default:
                PRINT_WARN("(%s): SIM ExMsg: 0x%02x\n",
-                          device->cdev->dev.bus_id, sense->fmt.f71.emc);
+                          dev_name(&device->cdev->dev), sense->fmt.f71.emc);
        }
        /* Service Message */
        switch (sense->fmt.f71.smc) {
        case 0x01:
                PRINT_WARN("(%s): Repair impact is unknown\n",
-                          device->cdev->dev.bus_id);
+                          dev_name(&device->cdev->dev));
                break;
        case 0x02:
                PRINT_WARN("(%s): Repair will not impact cu performance\n",
-                          device->cdev->dev.bus_id);
+                          dev_name(&device->cdev->dev));
                break;
        case 0x03:
                if (sense->fmt.f71.mdf == 0)
                        PRINT_WARN("(%s): Repair will disable node "
                                   "0x%x on CU\n",
-                                  device->cdev->dev.bus_id,
+                                  dev_name(&device->cdev->dev),
                                   sense->fmt.f71.md[1]);
                else
                        PRINT_WARN("(%s): Repair will disable nodes "
                                   "(0x%x-0x%x) on CU\n",
-                                  device->cdev->dev.bus_id,
+                                  dev_name(&device->cdev->dev),
                                   sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                break;
        case 0x04:
                if (sense->fmt.f71.mdf == 0)
                        PRINT_WARN("(%s): Repair will disable cannel path "
                                   "0x%x on CU\n",
-                                  device->cdev->dev.bus_id,
+                                  dev_name(&device->cdev->dev),
                                   sense->fmt.f71.md[1]);
                else
                        PRINT_WARN("(%s): Repair will disable cannel paths "
                                   "(0x%x-0x%x) on CU\n",
-                                  device->cdev->dev.bus_id,
+                                  dev_name(&device->cdev->dev),
                                   sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                break;
        case 0x05:
                if (sense->fmt.f71.mdf == 0)
                        PRINT_WARN("(%s): Repair will disable device path "
                                   "0x%x on CU\n",
-                                  device->cdev->dev.bus_id,
+                                  dev_name(&device->cdev->dev),
                                   sense->fmt.f71.md[1]);
                else
                        PRINT_WARN("(%s): Repair will disable device paths "
                                   "(0x%x-0x%x) on CU\n",
-                                  device->cdev->dev.bus_id,
+                                  dev_name(&device->cdev->dev),
                                   sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                break;
        case 0x06:
                if (sense->fmt.f71.mdf == 0)
                        PRINT_WARN("(%s): Repair will disable library path "
                                   "0x%x on CU\n",
-                                  device->cdev->dev.bus_id,
+                                  dev_name(&device->cdev->dev),
                                   sense->fmt.f71.md[1]);
                else
                        PRINT_WARN("(%s): Repair will disable library paths "
                                   "(0x%x-0x%x) on CU\n",
-                                  device->cdev->dev.bus_id,
+                                  dev_name(&device->cdev->dev),
                                   sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                break;
        case 0x07:
                PRINT_WARN("(%s): Repair will disable access to CU\n",
-                          device->cdev->dev.bus_id);
+                          dev_name(&device->cdev->dev));
                break;
        default:
                PRINT_WARN("(%s): SIM ServiceMsg: 0x%02x\n",
-                          device->cdev->dev.bus_id, sense->fmt.f71.smc);
+                          dev_name(&device->cdev->dev), sense->fmt.f71.smc);
        }
 }
 
@@ -1165,104 +1168,104 @@ tape_3590_print_dev_sim_msg_f2(struct tape_device *device, struct irb *irb)
        switch (sense->fmt.f71.emc) {
        case 0x01:
                PRINT_WARN("(%s): Effect of failure is unknown\n",
-                          device->cdev->dev.bus_id);
+                          dev_name(&device->cdev->dev));
                break;
        case 0x02:
                PRINT_WARN("(%s): DV Exception - no performance impact\n",
-                          device->cdev->dev.bus_id);
+                          dev_name(&device->cdev->dev));
                break;
        case 0x03:
                PRINT_WARN("(%s): DV Exception on channel interface 0x%02x\n",
-                          device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                          dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                break;
        case 0x04:
                PRINT_WARN("(%s): DV Exception on loader 0x%02x\n",
-                          device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                          dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                break;
        case 0x05:
                PRINT_WARN("(%s): DV Exception on message display 0x%02x\n",
-                          device->cdev->dev.bus_id, sense->fmt.f71.md[0]);
+                          dev_name(&device->cdev->dev), sense->fmt.f71.md[0]);
                break;
        case 0x06:
                PRINT_WARN("(%s): DV Exception in tape path\n",
-                          device->cdev->dev.bus_id);
+                          dev_name(&device->cdev->dev));
                break;
        case 0x07:
                PRINT_WARN("(%s): DV Exception in drive\n",
-                          device->cdev->dev.bus_id);
+                          dev_name(&device->cdev->dev));
                break;
        default:
                PRINT_WARN("(%s): DSIM ExMsg: 0x%02x\n",
-                          device->cdev->dev.bus_id, sense->fmt.f71.emc);
+                          dev_name(&device->cdev->dev), sense->fmt.f71.emc);
        }
        /* Service Message */
        switch (sense->fmt.f71.smc) {
        case 0x01:
                PRINT_WARN("(%s): Repair impact is unknown\n",
-                          device->cdev->dev.bus_id);
+                          dev_name(&device->cdev->dev));
                break;
        case 0x02:
                PRINT_WARN("(%s): Repair will not impact device performance\n",
-                          device->cdev->dev.bus_id);
+                          dev_name(&device->cdev->dev));
                break;
        case 0x03:
                if (sense->fmt.f71.mdf == 0)
                        PRINT_WARN("(%s): Repair will disable channel path "
                                   "0x%x on DV\n",
-                                  device->cdev->dev.bus_id,
+                                  dev_name(&device->cdev->dev),
                                   sense->fmt.f71.md[1]);
                else
                        PRINT_WARN("(%s): Repair will disable channel path "
                                   "(0x%x-0x%x) on DV\n",
-                                  device->cdev->dev.bus_id,
+                                  dev_name(&device->cdev->dev),
                                   sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                break;
        case 0x04:
                if (sense->fmt.f71.mdf == 0)
                        PRINT_WARN("(%s): Repair will disable interface 0x%x "
                                   "on DV\n",
-                                  device->cdev->dev.bus_id,
+                                  dev_name(&device->cdev->dev),
                                   sense->fmt.f71.md[1]);
                else
                        PRINT_WARN("(%s): Repair will disable interfaces "
                                   "(0x%x-0x%x) on DV\n",
-                                  device->cdev->dev.bus_id,
+                                  dev_name(&device->cdev->dev),
                                   sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                break;
        case 0x05:
                if (sense->fmt.f71.mdf == 0)
                        PRINT_WARN("(%s): Repair will disable loader 0x%x "
                                   "on DV\n",
-                                  device->cdev->dev.bus_id,
+                                  dev_name(&device->cdev->dev),
                                   sense->fmt.f71.md[1]);
                else
                        PRINT_WARN("(%s): Repair will disable loader "
                                   "(0x%x-0x%x) on DV\n",
-                                  device->cdev->dev.bus_id,
+                                  dev_name(&device->cdev->dev),
                                   sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                break;
        case 0x07:
                PRINT_WARN("(%s): Repair will disable access to DV\n",
-                          device->cdev->dev.bus_id);
+                          dev_name(&device->cdev->dev));
                break;
        case 0x08:
                if (sense->fmt.f71.mdf == 0)
                        PRINT_WARN("(%s): Repair will disable message "
                                   "display 0x%x on DV\n",
-                                  device->cdev->dev.bus_id,
+                                  dev_name(&device->cdev->dev),
                                   sense->fmt.f71.md[1]);
                else
                        PRINT_WARN("(%s): Repair will disable message "
                                   "displays (0x%x-0x%x) on DV\n",
-                                  device->cdev->dev.bus_id,
+                                  dev_name(&device->cdev->dev),
                                   sense->fmt.f71.md[1], sense->fmt.f71.md[2]);
                break;
        case 0x09:
-               PRINT_WARN("(%s): Clean DV\n", device->cdev->dev.bus_id);
+               PRINT_WARN("(%s): Clean DV\n", dev_name(&device->cdev->dev));
                break;
        default:
                PRINT_WARN("(%s): DSIM ServiceMsg: 0x%02x\n",
-                          device->cdev->dev.bus_id, sense->fmt.f71.smc);
+                          dev_name(&device->cdev->dev), sense->fmt.f71.smc);
        }
 }
 
@@ -1279,18 +1282,18 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)
                return;
        if ((sense->mc > 0) && (sense->mc < TAPE_3590_MAX_MSG)) {
                if (tape_3590_msg[sense->mc] != NULL)
-                       PRINT_WARN("(%s): %s\n", device->cdev->dev.bus_id,
+                       PRINT_WARN("(%s): %s\n", dev_name(&device->cdev->dev),
                                   tape_3590_msg[sense->mc]);
                else {
                        PRINT_WARN("(%s): Message Code 0x%x\n",
-                                  device->cdev->dev.bus_id, sense->mc);
+                                  dev_name(&device->cdev->dev), sense->mc);
                }
                return;
        }
        if (sense->mc == 0xf0) {
                /* Standard Media Information Message */
                PRINT_WARN("(%s): MIM SEV=%i, MC=%02x, ES=%x/%x, "
-                          "RC=%02x-%04x-%02x\n", device->cdev->dev.bus_id,
+                          "RC=%02x-%04x-%02x\n", dev_name(&device->cdev->dev),
                           sense->fmt.f70.sev, sense->mc,
                           sense->fmt.f70.emc, sense->fmt.f70.smc,
                           sense->fmt.f70.refcode, sense->fmt.f70.mid,
@@ -1302,7 +1305,7 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)
                /* Standard I/O Subsystem Service Information Message */
                PRINT_WARN("(%s): IOSIM SEV=%i, DEVTYPE=3590/%02x, "
                           "MC=%02x, ES=%x/%x, REF=0x%04x-0x%04x-0x%04x\n",
-                          device->cdev->dev.bus_id, sense->fmt.f71.sev,
+                          dev_name(&device->cdev->dev), sense->fmt.f71.sev,
                           device->cdev->id.dev_model,
                           sense->mc, sense->fmt.f71.emc,
                           sense->fmt.f71.smc, sense->fmt.f71.refcode1,
@@ -1314,7 +1317,7 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)
                /* Standard Device Service Information Message */
                PRINT_WARN("(%s): DEVSIM SEV=%i, DEVTYPE=3590/%02x, "
                           "MC=%02x, ES=%x/%x, REF=0x%04x-0x%04x-0x%04x\n",
-                          device->cdev->dev.bus_id, sense->fmt.f71.sev,
+                          dev_name(&device->cdev->dev), sense->fmt.f71.sev,
                           device->cdev->id.dev_model,
                           sense->mc, sense->fmt.f71.emc,
                           sense->fmt.f71.smc, sense->fmt.f71.refcode1,
@@ -1327,7 +1330,7 @@ tape_3590_print_era_msg(struct tape_device *device, struct irb *irb)
                return;
        }
        PRINT_WARN("(%s): Device Message(%x)\n",
-                  device->cdev->dev.bus_id, sense->mc);
+                  dev_name(&device->cdev->dev), sense->mc);
 }
 
 static int tape_3590_crypt_error(struct tape_device *device,
@@ -1336,10 +1339,11 @@ static int tape_3590_crypt_error(struct tape_device *device,
        u8 cu_rc, ekm_rc1;
        u16 ekm_rc2;
        u32 drv_rc;
-       char *bus_id, *sense;
+       const char *bus_id;
+       char *sense;
 
        sense = ((struct tape_3590_sense *) irb->ecw)->fmt.data;
-       bus_id = device->cdev->dev.bus_id;
+       bus_id = dev_name(&device->cdev->dev);
        cu_rc = sense[0];
        drv_rc = *((u32*) &sense[5]) & 0xffffff;
        ekm_rc1 = sense[9];
@@ -1440,7 +1444,7 @@ tape_3590_unit_check(struct tape_device *device, struct tape_request *request,
                 * "device intervention" is not very meaningfull
                 */
                PRINT_WARN("(%s): Tape operation when medium not loaded\n",
-                          device->cdev->dev.bus_id);
+                          dev_name(&device->cdev->dev));
                tape_med_state_set(device, MS_UNLOADED);
                tape_3590_schedule_work(device, TO_CRYPT_OFF);
                return tape_3590_erp_basic(device, request, irb, -ENOMEDIUM);
@@ -1487,18 +1491,18 @@ tape_3590_unit_check(struct tape_device *device, struct tape_request *request,
 
        case 0x6020:
                PRINT_WARN("(%s): Cartridge of wrong type ?\n",
-                          device->cdev->dev.bus_id);
+                          dev_name(&device->cdev->dev));
                return tape_3590_erp_basic(device, request, irb, -EMEDIUMTYPE);
 
        case 0x8011:
                PRINT_WARN("(%s): Another host has reserved the tape device\n",
-                          device->cdev->dev.bus_id);
+                          dev_name(&device->cdev->dev));
                return tape_3590_erp_basic(device, request, irb, -EPERM);
        case 0x8013:
                PRINT_WARN("(%s): Another host has privileged access to the "
-                          "tape device\n", device->cdev->dev.bus_id);
+                          "tape device\n", dev_name(&device->cdev->dev));
                PRINT_WARN("(%s): To solve the problem unload the current "
-                          "cartridge!\n", device->cdev->dev.bus_id);
+                          "cartridge!\n", dev_name(&device->cdev->dev));
                return tape_3590_erp_basic(device, request, irb, -EPERM);
        default:
                return tape_3590_erp_basic(device, request, irb, -EIO);

diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c
index 95da72bc17e8d7e3b218bfe0c4f46a1a9d306900..a25b8bf54f418103ef4dca4da08dd13e1e9d6513 100644 (file)
--- a/drivers/s390/char/tape_block.c
+++ b/drivers/s390/char/tape_block.c
@@ -278,7 +278,7 @@ tapeblock_cleanup_device(struct tape_device *device)
 
        if (!device->blk_data.disk) {
                PRINT_ERR("(%s): No gendisk to clean up!\n",
-                       device->cdev->dev.bus_id);
+                       dev_name(&device->cdev->dev));
                goto cleanup_queue;
        }
 

diff --git a/drivers/s390/char/tape_core.c b/drivers/s390/char/tape_core.c
index 181a5441af16f92dad8b1c0bba954ca5bbefca51..d7073dbf825c4148a58195ff3a204371b9881547 100644 (file)
--- a/drivers/s390/char/tape_core.c
+++ b/drivers/s390/char/tape_core.c
@@ -215,12 +215,12 @@ tape_med_state_set(struct tape_device *device, enum tape_medium_state newstate)
        case MS_UNLOADED:
                device->tape_generic_status |= GMT_DR_OPEN(~0);
                PRINT_INFO("(%s): Tape is unloaded\n",
-                          device->cdev->dev.bus_id);
+                          dev_name(&device->cdev->dev));
                break;
        case MS_LOADED:
                device->tape_generic_status &= ~GMT_DR_OPEN(~0);
                PRINT_INFO("(%s): Tape has been mounted\n",
-                          device->cdev->dev.bus_id);
+                          dev_name(&device->cdev->dev));
                break;
        default:
                // print nothing
@@ -415,7 +415,7 @@ tape_generic_offline(struct tape_device *device)
                                device->cdev_id);
                        PRINT_WARN("(%s): Set offline failed "
                                "- drive in use.\n",
-                               device->cdev->dev.bus_id);
+                               dev_name(&device->cdev->dev));
                        spin_unlock_irq(get_ccwdev_lock(device->cdev));
                        return -EBUSY;
        }
@@ -538,7 +538,8 @@ tape_generic_probe(struct ccw_device *cdev)
        ret = sysfs_create_group(&cdev->dev.kobj, &tape_attr_group);
        if (ret) {
                tape_put_device(device);
-               PRINT_ERR("probe failed for tape device %s\n", cdev->dev.bus_id);
+               PRINT_ERR("probe failed for tape device %s\n",
+                         dev_name(&cdev->dev));
                return ret;
        }
        cdev->dev.driver_data = device;
@@ -546,7 +547,7 @@ tape_generic_probe(struct ccw_device *cdev)
        device->cdev = cdev;
        ccw_device_get_id(cdev, &dev_id);
        device->cdev_id = devid_to_int(&dev_id);
-       PRINT_INFO("tape device %s found\n", cdev->dev.bus_id);
+       PRINT_INFO("tape device %s found\n", dev_name(&cdev->dev));
        return ret;
 }
 
@@ -616,7 +617,7 @@ tape_generic_remove(struct ccw_device *cdev)
                                device->cdev_id);
                        PRINT_WARN("(%s): Drive in use vanished - "
                                "expect trouble!\n",
-                               device->cdev->dev.bus_id);
+                               dev_name(&device->cdev->dev));
                        PRINT_WARN("State was %i\n", device->tape_state);
                        tape_state_set(device, TS_NOT_OPER);
                        __tape_discard_requests(device);
@@ -840,7 +841,7 @@ tape_dump_sense(struct tape_device* device, struct tape_request *request,
        PRINT_INFO("-------------------------------------------------\n");
        PRINT_INFO("DSTAT : %02x  CSTAT: %02x   CPA: %04x\n",
                   irb->scsw.cmd.dstat, irb->scsw.cmd.cstat, irb->scsw.cmd.cpa);
-       PRINT_INFO("DEVICE: %s\n", device->cdev->dev.bus_id);
+       PRINT_INFO("DEVICE: %s\n", dev_name(&device->cdev->dev));
        if (request != NULL)
                PRINT_INFO("OP    : %s\n", tape_op_verbose[request->op]);
 
@@ -1051,7 +1052,7 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
        device = (struct tape_device *) cdev->dev.driver_data;
        if (device == NULL) {
                PRINT_ERR("could not get device structure for %s "
-                         "in interrupt\n", cdev->dev.bus_id);
+                         "in interrupt\n", dev_name(&cdev->dev));
                return;
        }
        request = (struct tape_request *) intparm;
@@ -1064,13 +1065,13 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                switch (PTR_ERR(irb)) {
                        case -ETIMEDOUT:
                                PRINT_WARN("(%s): Request timed out\n",
-                                       cdev->dev.bus_id);
+                                       dev_name(&cdev->dev));
                        case -EIO:
                                __tape_end_request(device, request, -EIO);
                                break;
                        default:
                                PRINT_ERR("(%s): Unexpected i/o error %li\n",
-                                       cdev->dev.bus_id,
+                                       dev_name(&cdev->dev),
                                        PTR_ERR(irb));
                }
                return;

diff --git a/drivers/s390/char/tape_proc.c b/drivers/s390/char/tape_proc.c
index e7c888c14e71f847b6ba8aa05e2797c700a2ca6a..8a376af926a7407389d1643350afdf42814e726a 100644 (file)
--- a/drivers/s390/char/tape_proc.c
+++ b/drivers/s390/char/tape_proc.c
@@ -52,7 +52,7 @@ static int tape_proc_show(struct seq_file *m, void *v)
                return 0;
        spin_lock_irq(get_ccwdev_lock(device->cdev));
        seq_printf(m, "%d\t", (int) n);
-       seq_printf(m, "%-10.10s ", device->cdev->dev.bus_id);
+       seq_printf(m, "%-10.10s ", dev_name(&device->cdev->dev));
        seq_printf(m, "%04X/", device->cdev->id.cu_type);
        seq_printf(m, "%02X\t", device->cdev->id.cu_model);
        seq_printf(m, "%04X/", device->cdev->id.dev_type);

diff --git a/drivers/s390/char/tape_std.c b/drivers/s390/char/tape_std.c
index cc8fd781ee227ce6e8f1ae38956b2fb002fe5ad6..5bd573d144d6d880a4e130469e6e937b163e5ffa 100644 (file)
--- a/drivers/s390/char/tape_std.c
+++ b/drivers/s390/char/tape_std.c
@@ -47,7 +47,7 @@ tape_std_assign_timeout(unsigned long data)
        rc = tape_cancel_io(device, request);
        if(rc)
                PRINT_ERR("(%s): Assign timeout: Cancel failed with rc = %i\n",
-                       device->cdev->dev.bus_id, rc);
+                       dev_name(&device->cdev->dev), rc);
 
 }
 
@@ -83,7 +83,7 @@ tape_std_assign(struct tape_device *device)
 
        if (rc != 0) {
                PRINT_WARN("%s: assign failed - device might be busy\n",
-                       device->cdev->dev.bus_id);
+                       dev_name(&device->cdev->dev));
                DBF_EVENT(3, "%08x: assign failed - device might be busy\n",
                        device->cdev_id);
        } else {
@@ -106,7 +106,7 @@ tape_std_unassign (struct tape_device *device)
                DBF_EVENT(3, "(%08x): Can't unassign device\n",
                        device->cdev_id);
                PRINT_WARN("(%s): Can't unassign device - device gone\n",
-                       device->cdev->dev.bus_id);
+                       dev_name(&device->cdev->dev));
                return -EIO;
        }
 
@@ -120,7 +120,8 @@ tape_std_unassign (struct tape_device *device)
 
        if ((rc = tape_do_io(device, request)) != 0) {
                DBF_EVENT(3, "%08x: Unassign failed\n", device->cdev_id);
-               PRINT_WARN("%s: Unassign failed\n", device->cdev->dev.bus_id);
+               PRINT_WARN("%s: Unassign failed\n",
+                          dev_name(&device->cdev->dev));
        } else {
                DBF_EVENT(3, "%08x: Tape unassigned\n", device->cdev_id);
        }
@@ -634,10 +635,10 @@ tape_std_mtcompression(struct tape_device *device, int mt_count)
                DBF_EXCEPTION(6, "xcom parm\n");
                if (*device->modeset_byte & 0x08)
                        PRINT_INFO("(%s) Compression is currently on\n",
-                                  device->cdev->dev.bus_id);
+                                  dev_name(&device->cdev->dev));
                else
                        PRINT_INFO("(%s) Compression is currently off\n",
-                                  device->cdev->dev.bus_id);
+                                  dev_name(&device->cdev->dev));
                PRINT_INFO("Use 1 to switch compression on, 0 to "
                           "switch it off\n");
                return -EINVAL;

diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index c31faefa2b3b40dfcfe93e84249c50f821a10e4a..036e650e8b9c53b5a8bc2dac305ed714b44d4c6e 100644 (file)
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -751,7 +751,7 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv)
        priv->class_device = device_create_drvdata(vmlogrdr_class, dev,
                                                   MKDEV(vmlogrdr_major,
                                                         priv->minor_num),
-                                                  priv, "%s", dev->bus_id);
+                                                  priv, "%s", dev_name(dev));
        if (IS_ERR(priv->class_device)) {
                ret = PTR_ERR(priv->class_device);
                priv->class_device=NULL;

diff --git a/drivers/s390/char/vmur.c b/drivers/s390/char/vmur.c
index c1f352b84868c16affd93a7ff7af1f162527eb2b..6fdfa5ddeca8f686938f0b52d4bb28b504bfcddc 100644 (file)
--- a/drivers/s390/char/vmur.c
+++ b/drivers/s390/char/vmur.c
@@ -886,11 +886,11 @@ static int ur_set_online(struct ccw_device *cdev)
                goto fail_free_cdev;
        if (urd->cdev->id.cu_type == READER_PUNCH_DEVTYPE) {
                if (urd->class == DEV_CLASS_UR_I)
-                       sprintf(node_id, "vmrdr-%s", cdev->dev.bus_id);
+                       sprintf(node_id, "vmrdr-%s", dev_name(&cdev->dev));
                if (urd->class == DEV_CLASS_UR_O)
-                       sprintf(node_id, "vmpun-%s", cdev->dev.bus_id);
+                       sprintf(node_id, "vmpun-%s", dev_name(&cdev->dev));
        } else if (urd->cdev->id.cu_type == PRINTER_DEVTYPE) {
-               sprintf(node_id, "vmprt-%s", cdev->dev.bus_id);
+               sprintf(node_id, "vmprt-%s", dev_name(&cdev->dev));
        } else {
                rc = -EOPNOTSUPP;
                goto fail_free_cdev;

diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index 9a50f245774b0491e1c31532d059049cab945c7b..e17b462ace03e7ca30ceb8201f9d85c594c69850 100644 (file)
--- 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 326f4cc7f92c932578870443f1421488501c25c0..8759912734e02644efc3432ae539a3f22022ede7 100644 (file)
--- 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 8575d263b13e18b54c2f6957d615db37a930cd97..95b92dfec5a815435630b1e7692591aa2dedad0c 100644 (file)
--- 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 84cc9ea346dbc264639d892a19e591ef7535ef8f..10bc03940fb3144fd412e1625eaaa003fd64459d 100644 (file)
--- 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 ee1a28310fbb11945c07714fc9dfef94b4a20752..eabcc42d63df17ca5bfc9afd89a1b6211b92f61a 100644 (file)
--- 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)

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);

diff --git a/drivers/s390/net/claw.h b/drivers/s390/net/claw.h
index 1a89d989f34811651d61dccd735fdf53f9701555..005072c420d30deeb304874054cb6142a7411fe5 100644 (file)
--- 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 b11fec24c7d270f1311fd87c342189fd6878d3a6..d2374cf4c4b973e434daacb1de9df82bf572d9fd 100644 (file)
--- 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 8e10ee86a5eedc141ab52c391b85f537e8d8148b..d77cce3fe4d48a8bbc6cc97b5346299873f9eeb3 100644 (file)
--- 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 9bcfa04d863b315df94c2f01e087d071f125679a..0825be87e5a00d47812cfef79eee1d784599993c 100644 (file)
--- 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 bf8a75c92f2896d48290683ea2cb032e38d01ba4..af6d6045851394f94d9234af65ac115b4c37a9ef 100644 (file)
--- 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 c7ab1b864516694e97eb3438a70b26f7a20fb952..141b2bb7b3cf44513f6674e9f9d72ec9e9a1b14c 100644 (file)
--- 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) {

diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h
index 73eb41580f25c40fe3dc41861703de5c9f9f2bb8..c69345f1f73c7901b40dfe5af88245a579a0da13 100644 (file)
--- a/drivers/s390/scsi/zfcp_def.h
+++ b/drivers/s390/scsi/zfcp_def.h
@@ -596,7 +596,7 @@ struct zfcp_data {
        struct semaphore        config_sema;        /* serialises configuration
                                                       changes */
        atomic_t                loglevel;            /* current loglevel */
-       char                    init_busid[BUS_ID_SIZE];
+       char                    init_busid[20];
        u64                     init_wwpn;
        u64                     init_fcp_lun;
        struct kmem_cache       *fsf_req_qtcb_cache;