Commit 2a0217d5 authored by Kay Sievers's avatar Kay Sievers Committed by Martin Schwidefsky
Browse files

[S390] bus_id -> dev_name conversions



bus_id -> dev_name() conversions in s390 code.

[cornelia.huck@de.ibm.com: minor adaptions]
Signed-off-by: default avatarKay Sievers <kay.sievers@vrfy.org>
Cc: Cornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent e4a1afae
...@@ -215,7 +215,7 @@ static int dasd_state_known_to_basic(struct dasd_device *device) ...@@ -215,7 +215,7 @@ static int dasd_state_known_to_basic(struct dasd_device *device)
return rc; return rc;
} }
/* register 'device' debug area, used for all DBF_DEV_XXX calls */ /* 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)); 8 * sizeof(long));
debug_register_view(device->debug_area, &debug_sprintf_view); debug_register_view(device->debug_area, &debug_sprintf_view);
debug_set_level(device->debug_area, DBF_WARNING); debug_set_level(device->debug_area, DBF_WARNING);
...@@ -933,7 +933,7 @@ static void dasd_handle_killed_request(struct ccw_device *cdev, ...@@ -933,7 +933,7 @@ static void dasd_handle_killed_request(struct ccw_device *cdev,
MESSAGE(KERN_DEBUG, MESSAGE(KERN_DEBUG,
"invalid status in handle_killed_request: " "invalid status in handle_killed_request: "
"bus_id %s, status %02x", "bus_id %s, status %02x",
cdev->dev.bus_id, cqr->status); dev_name(&cdev->dev), cqr->status);
return; return;
} }
...@@ -942,7 +942,7 @@ static void dasd_handle_killed_request(struct ccw_device *cdev, ...@@ -942,7 +942,7 @@ static void dasd_handle_killed_request(struct ccw_device *cdev,
device != dasd_device_from_cdev_locked(cdev) || device != dasd_device_from_cdev_locked(cdev) ||
strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) { strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) {
MESSAGE(KERN_DEBUG, "invalid device in request: bus_id %s", MESSAGE(KERN_DEBUG, "invalid device in request: bus_id %s",
cdev->dev.bus_id); dev_name(&cdev->dev));
return; return;
} }
...@@ -982,11 +982,11 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm, ...@@ -982,11 +982,11 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
break; break;
case -ETIMEDOUT: case -ETIMEDOUT:
printk(KERN_WARNING"%s(%s): request timed out\n", printk(KERN_WARNING"%s(%s): request timed out\n",
__func__, cdev->dev.bus_id); __func__, dev_name(&cdev->dev));
break; break;
default: default:
printk(KERN_WARNING"%s(%s): unknown error %ld\n", 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); dasd_handle_killed_request(cdev, intparm);
return; return;
...@@ -995,7 +995,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm, ...@@ -995,7 +995,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
now = get_clock(); now = get_clock();
DBF_EVENT(DBF_ERR, "Interrupt: bus_id %s CS/DS %04x ip %08x", 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); irb->scsw.cmd.dstat), (unsigned int) intparm);
/* check for unsolicited interrupts */ /* check for unsolicited interrupts */
...@@ -1019,7 +1019,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm, ...@@ -1019,7 +1019,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
if (!device || if (!device ||
strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) { strncmp(device->discipline->ebcname, (char *) &cqr->magic, 4)) {
MESSAGE(KERN_DEBUG, "invalid device in request: bus_id %s", MESSAGE(KERN_DEBUG, "invalid device in request: bus_id %s",
cdev->dev.bus_id); dev_name(&cdev->dev));
return; return;
} }
...@@ -1037,7 +1037,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm, ...@@ -1037,7 +1037,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
if (cqr->status != DASD_CQR_IN_IO) { if (cqr->status != DASD_CQR_IN_IO) {
MESSAGE(KERN_DEBUG, MESSAGE(KERN_DEBUG,
"invalid status: bus_id %s, status %02x", "invalid status: bus_id %s, status %02x",
cdev->dev.bus_id, cqr->status); dev_name(&cdev->dev), cqr->status);
return; return;
} }
DBF_DEV_EVENT(DBF_DEBUG, device, "Int: CS/DS 0x%04x for cqr %p", 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, ...@@ -2134,14 +2134,14 @@ int dasd_generic_probe(struct ccw_device *cdev,
if (ret) { if (ret) {
printk(KERN_WARNING printk(KERN_WARNING
"dasd_generic_probe: could not set ccw-device options " "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; return ret;
} }
ret = dasd_add_sysfs_files(cdev); ret = dasd_add_sysfs_files(cdev);
if (ret) { if (ret) {
printk(KERN_WARNING printk(KERN_WARNING
"dasd_generic_probe: could not add sysfs entries " "dasd_generic_probe: could not add sysfs entries "
"for %s\n", cdev->dev.bus_id); "for %s\n", dev_name(&cdev->dev));
return ret; return ret;
} }
cdev->handler = &dasd_int_handler; cdev->handler = &dasd_int_handler;
...@@ -2152,13 +2152,13 @@ int dasd_generic_probe(struct ccw_device *cdev, ...@@ -2152,13 +2152,13 @@ int dasd_generic_probe(struct ccw_device *cdev,
* initial probe. * initial probe.
*/ */
if ((dasd_get_feature(cdev, DASD_FEATURE_INITIAL_ONLINE) > 0 ) || 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); ret = ccw_device_set_online(cdev);
if (ret) if (ret)
printk(KERN_WARNING printk(KERN_WARNING
"dasd_generic_probe: could not initially " "dasd_generic_probe: could not initially "
"online ccw-device %s; return code: %d\n", "online ccw-device %s; return code: %d\n",
cdev->dev.bus_id, ret); dev_name(&cdev->dev), ret);
return 0; return 0;
} }
...@@ -2224,7 +2224,7 @@ int dasd_generic_set_online(struct ccw_device *cdev, ...@@ -2224,7 +2224,7 @@ int dasd_generic_set_online(struct ccw_device *cdev,
printk (KERN_WARNING printk (KERN_WARNING
"dasd_generic couldn't online device %s " "dasd_generic couldn't online device %s "
"- discipline DIAG not available\n", "- discipline DIAG not available\n",
cdev->dev.bus_id); dev_name(&cdev->dev));
dasd_delete_device(device); dasd_delete_device(device);
return -ENODEV; return -ENODEV;
} }
...@@ -2248,7 +2248,7 @@ int dasd_generic_set_online(struct ccw_device *cdev, ...@@ -2248,7 +2248,7 @@ int dasd_generic_set_online(struct ccw_device *cdev,
printk (KERN_WARNING printk (KERN_WARNING
"dasd_generic couldn't online device %s " "dasd_generic couldn't online device %s "
"with discipline %s rc=%i\n", "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(discipline->owner);
module_put(base_discipline->owner); module_put(base_discipline->owner);
dasd_delete_device(device); dasd_delete_device(device);
...@@ -2259,7 +2259,7 @@ int dasd_generic_set_online(struct ccw_device *cdev, ...@@ -2259,7 +2259,7 @@ int dasd_generic_set_online(struct ccw_device *cdev,
if (device->state <= DASD_STATE_KNOWN) { if (device->state <= DASD_STATE_KNOWN) {
printk (KERN_WARNING printk (KERN_WARNING
"dasd_generic discipline not found for %s\n", "dasd_generic discipline not found for %s\n",
cdev->dev.bus_id); dev_name(&cdev->dev));
rc = -ENODEV; rc = -ENODEV;
dasd_set_target_state(device, DASD_STATE_NEW); dasd_set_target_state(device, DASD_STATE_NEW);
if (device->block) if (device->block)
...@@ -2267,7 +2267,7 @@ int dasd_generic_set_online(struct ccw_device *cdev, ...@@ -2267,7 +2267,7 @@ int dasd_generic_set_online(struct ccw_device *cdev,
dasd_delete_device(device); dasd_delete_device(device);
} else } else
pr_debug("dasd_generic device %s found\n", 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 /* 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. */ * to wait for each single device but for all at once. */
......
...@@ -1397,7 +1397,7 @@ static struct dasd_ccw_req *dasd_3990_erp_inspect_alias( ...@@ -1397,7 +1397,7 @@ static struct dasd_ccw_req *dasd_3990_erp_inspect_alias(
DEV_MESSAGE(KERN_ERR, cqr->startdev, DEV_MESSAGE(KERN_ERR, cqr->startdev,
"ERP on alias device for request %p," "ERP on alias device for request %p,"
" recover on base device %s", cqr, " 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); dasd_eckd_reset_ccw_to_base_io(cqr);
erp->startdev = cqr->block->base; erp->startdev = cqr->block->base;
......
...@@ -515,9 +515,9 @@ dasd_devmap_from_cdev(struct ccw_device *cdev) ...@@ -515,9 +515,9 @@ dasd_devmap_from_cdev(struct ccw_device *cdev)
{ {
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
devmap = dasd_find_busid(cdev->dev.bus_id); devmap = dasd_find_busid(dev_name(&cdev->dev));
if (IS_ERR(devmap)) if (IS_ERR(devmap))
devmap = dasd_add_busid(cdev->dev.bus_id, devmap = dasd_add_busid(dev_name(&cdev->dev),
DASD_FEATURE_DEFAULT); DASD_FEATURE_DEFAULT);
return devmap; return devmap;
} }
...@@ -584,7 +584,7 @@ dasd_delete_device(struct dasd_device *device) ...@@ -584,7 +584,7 @@ dasd_delete_device(struct dasd_device *device)
unsigned long flags; unsigned long flags;
/* First remove device pointer from devmap. */ /* 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)); BUG_ON(IS_ERR(devmap));
spin_lock(&dasd_devmap_lock); spin_lock(&dasd_devmap_lock);
if (devmap->device != device) { if (devmap->device != device) {
...@@ -674,7 +674,7 @@ dasd_ro_show(struct device *dev, struct device_attribute *attr, char *buf) ...@@ -674,7 +674,7 @@ dasd_ro_show(struct device *dev, struct device_attribute *attr, char *buf)
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
int ro_flag; int ro_flag;
devmap = dasd_find_busid(dev->bus_id); devmap = dasd_find_busid(dev_name(dev));
if (!IS_ERR(devmap)) if (!IS_ERR(devmap))
ro_flag = (devmap->features & DASD_FEATURE_READONLY) != 0; ro_flag = (devmap->features & DASD_FEATURE_READONLY) != 0;
else else
...@@ -723,7 +723,7 @@ dasd_erplog_show(struct device *dev, struct device_attribute *attr, char *buf) ...@@ -723,7 +723,7 @@ dasd_erplog_show(struct device *dev, struct device_attribute *attr, char *buf)
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
int erplog; int erplog;
devmap = dasd_find_busid(dev->bus_id); devmap = dasd_find_busid(dev_name(dev));
if (!IS_ERR(devmap)) if (!IS_ERR(devmap))
erplog = (devmap->features & DASD_FEATURE_ERPLOG) != 0; erplog = (devmap->features & DASD_FEATURE_ERPLOG) != 0;
else else
...@@ -770,7 +770,7 @@ dasd_use_diag_show(struct device *dev, struct device_attribute *attr, char *buf) ...@@ -770,7 +770,7 @@ dasd_use_diag_show(struct device *dev, struct device_attribute *attr, char *buf)
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
int use_diag; int use_diag;
devmap = dasd_find_busid(dev->bus_id); devmap = dasd_find_busid(dev_name(dev));
if (!IS_ERR(devmap)) if (!IS_ERR(devmap))
use_diag = (devmap->features & DASD_FEATURE_USEDIAG) != 0; use_diag = (devmap->features & DASD_FEATURE_USEDIAG) != 0;
else else
...@@ -876,7 +876,7 @@ dasd_alias_show(struct device *dev, struct device_attribute *attr, char *buf) ...@@ -876,7 +876,7 @@ dasd_alias_show(struct device *dev, struct device_attribute *attr, char *buf)
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
int alias; int alias;
devmap = dasd_find_busid(dev->bus_id); devmap = dasd_find_busid(dev_name(dev));
spin_lock(&dasd_devmap_lock); spin_lock(&dasd_devmap_lock);
if (IS_ERR(devmap) || strlen(devmap->uid.vendor) == 0) { if (IS_ERR(devmap) || strlen(devmap->uid.vendor) == 0) {
spin_unlock(&dasd_devmap_lock); spin_unlock(&dasd_devmap_lock);
...@@ -899,7 +899,7 @@ dasd_vendor_show(struct device *dev, struct device_attribute *attr, char *buf) ...@@ -899,7 +899,7 @@ dasd_vendor_show(struct device *dev, struct device_attribute *attr, char *buf)
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
char *vendor; char *vendor;
devmap = dasd_find_busid(dev->bus_id); devmap = dasd_find_busid(dev_name(dev));
spin_lock(&dasd_devmap_lock); spin_lock(&dasd_devmap_lock);
if (!IS_ERR(devmap) && strlen(devmap->uid.vendor) > 0) if (!IS_ERR(devmap) && strlen(devmap->uid.vendor) > 0)
vendor = devmap->uid.vendor; vendor = devmap->uid.vendor;
...@@ -924,7 +924,7 @@ dasd_uid_show(struct device *dev, struct device_attribute *attr, char *buf) ...@@ -924,7 +924,7 @@ dasd_uid_show(struct device *dev, struct device_attribute *attr, char *buf)
char ua_string[3]; char ua_string[3];
struct dasd_uid *uid; struct dasd_uid *uid;
devmap = dasd_find_busid(dev->bus_id); devmap = dasd_find_busid(dev_name(dev));
spin_lock(&dasd_devmap_lock); spin_lock(&dasd_devmap_lock);
if (IS_ERR(devmap) || strlen(devmap->uid.vendor) == 0) { if (IS_ERR(devmap) || strlen(devmap->uid.vendor) == 0) {
spin_unlock(&dasd_devmap_lock); spin_unlock(&dasd_devmap_lock);
...@@ -972,7 +972,7 @@ dasd_eer_show(struct device *dev, struct device_attribute *attr, char *buf) ...@@ -972,7 +972,7 @@ dasd_eer_show(struct device *dev, struct device_attribute *attr, char *buf)
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
int eer_flag; int eer_flag;
devmap = dasd_find_busid(dev->bus_id); devmap = dasd_find_busid(dev_name(dev));
if (!IS_ERR(devmap) && devmap->device) if (!IS_ERR(devmap) && devmap->device)
eer_flag = dasd_eer_enabled(devmap->device); eer_flag = dasd_eer_enabled(devmap->device);
else else
...@@ -1034,7 +1034,7 @@ dasd_get_uid(struct ccw_device *cdev, struct dasd_uid *uid) ...@@ -1034,7 +1034,7 @@ dasd_get_uid(struct ccw_device *cdev, struct dasd_uid *uid)
{ {
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
devmap = dasd_find_busid(cdev->dev.bus_id); devmap = dasd_find_busid(dev_name(&cdev->dev));
if (IS_ERR(devmap)) if (IS_ERR(devmap))
return PTR_ERR(devmap); return PTR_ERR(devmap);
spin_lock(&dasd_devmap_lock); spin_lock(&dasd_devmap_lock);
...@@ -1057,7 +1057,7 @@ dasd_set_uid(struct ccw_device *cdev, struct dasd_uid *uid) ...@@ -1057,7 +1057,7 @@ dasd_set_uid(struct ccw_device *cdev, struct dasd_uid *uid)
{ {
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
devmap = dasd_find_busid(cdev->dev.bus_id); devmap = dasd_find_busid(dev_name(&cdev->dev));
if (IS_ERR(devmap)) if (IS_ERR(devmap))
return PTR_ERR(devmap); return PTR_ERR(devmap);
...@@ -1077,7 +1077,7 @@ dasd_get_feature(struct ccw_device *cdev, int feature) ...@@ -1077,7 +1077,7 @@ dasd_get_feature(struct ccw_device *cdev, int feature)
{ {
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
devmap = dasd_find_busid(cdev->dev.bus_id); devmap = dasd_find_busid(dev_name(&cdev->dev));
if (IS_ERR(devmap)) if (IS_ERR(devmap))
return PTR_ERR(devmap); return PTR_ERR(devmap);
...@@ -1093,7 +1093,7 @@ dasd_set_feature(struct ccw_device *cdev, int feature, int flag) ...@@ -1093,7 +1093,7 @@ dasd_set_feature(struct ccw_device *cdev, int feature, int flag)
{ {
struct dasd_devmap *devmap; struct dasd_devmap *devmap;
devmap = dasd_find_busid(cdev->dev.bus_id); devmap = dasd_find_busid(dev_name(&cdev->dev));
if (IS_ERR(devmap)) if (IS_ERR(devmap))
return PTR_ERR(devmap); return PTR_ERR(devmap);
......
...@@ -84,7 +84,7 @@ dasd_eckd_probe (struct ccw_device *cdev) ...@@ -84,7 +84,7 @@ dasd_eckd_probe (struct ccw_device *cdev)
if (ret) { if (ret) {
printk(KERN_WARNING printk(KERN_WARNING
"dasd_eckd_probe: could not set ccw-device options " "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; return ret;
} }
ret = dasd_generic_probe(cdev, &dasd_eckd_discipline); ret = dasd_generic_probe(cdev, &dasd_eckd_discipline);
...@@ -2145,13 +2145,13 @@ static void dasd_eckd_dump_sense(struct dasd_device *device, ...@@ -2145,13 +2145,13 @@ static void dasd_eckd_dump_sense(struct dasd_device *device,
/* dump the sense data */ /* dump the sense data */
len = sprintf(page, KERN_ERR PRINTK_HEADER len = sprintf(page, KERN_ERR PRINTK_HEADER
" I/O status report for device %s:\n", " 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 len += sprintf(page + len, KERN_ERR PRINTK_HEADER
" in req: %p CS: 0x%02X DS: 0x%02X\n", req, " in req: %p CS: 0x%02X DS: 0x%02X\n", req,
irb->scsw.cmd.cstat, irb->scsw.cmd.dstat); irb->scsw.cmd.cstat, irb->scsw.cmd.dstat);
len += sprintf(page + len, KERN_ERR PRINTK_HEADER len += sprintf(page + len, KERN_ERR PRINTK_HEADER
" device %s: Failing CCW: %p\n", " device %s: Failing CCW: %p\n",
device->cdev->dev.bus_id, dev_name(&device->cdev->dev),
(void *) (addr_t) irb->scsw.cmd.cpa); (void *) (addr_t) irb->scsw.cmd.cpa);
if (irb->esw.esw0.erw.cons) { if (irb->esw.esw0.erw.cons) {
for (sl = 0; sl < 4; sl++) { for (sl = 0; sl < 4; sl++) {
......
...@@ -309,7 +309,8 @@ static void dasd_eer_write_standard_trigger(struct dasd_device *device, ...@@ -309,7 +309,8 @@ static void dasd_eer_write_standard_trigger(struct dasd_device *device,
do_gettimeofday(&tv); do_gettimeofday(&tv);
header.tv_sec = tv.tv_sec; header.tv_sec = tv.tv_sec;
header.tv_usec = tv.tv_usec; 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); spin_lock_irqsave(&bufferlock, flags);
list_for_each_entry(eerb, &bufferlist, list) { list_for_each_entry(eerb, &bufferlist, list) {
...@@ -349,7 +350,8 @@ static void dasd_eer_write_snss_trigger(struct dasd_device *device, ...@@ -349,7 +350,8 @@ static void dasd_eer_write_snss_trigger(struct dasd_device *device,
do_gettimeofday(&tv); do_gettimeofday(&tv);
header.tv_sec = tv.tv_sec; header.tv_sec = tv.tv_sec;
header.tv_usec = tv.tv_usec; 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); spin_lock_irqsave(&bufferlock, flags);
list_for_each_entry(eerb, &bufferlist, list) { list_for_each_entry(eerb, &bufferlist, list) {
......
...@@ -451,13 +451,13 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req, ...@@ -451,13 +451,13 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
} }
len = sprintf(page, KERN_ERR PRINTK_HEADER len = sprintf(page, KERN_ERR PRINTK_HEADER
" I/O status report for device %s:\n", " 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 len += sprintf(page + len, KERN_ERR PRINTK_HEADER
" in req: %p CS: 0x%02X DS: 0x%02X\n", req, " in req: %p CS: 0x%02X DS: 0x%02X\n", req,
irb->scsw.cmd.cstat, irb->scsw.cmd.dstat); irb->scsw.cmd.cstat, irb->scsw.cmd.dstat);
len += sprintf(page + len, KERN_ERR PRINTK_HEADER len += sprintf(page + len, KERN_ERR PRINTK_HEADER
" device %s: Failing CCW: %p\n", " device %s: Failing CCW: %p\n",
device->cdev->dev.bus_id, dev_name(&device->cdev->dev),
(void *) (addr_t) irb->scsw.cmd.cpa); (void *) (addr_t) irb->scsw.cmd.cpa);
if (irb->esw.esw0.erw.cons) { if (irb->esw.esw0.erw.cons) {
for (sl = 0; sl < 4; sl++) { for (sl = 0; sl < 4; sl++) {
......
...@@ -126,7 +126,7 @@ do { \ ...@@ -126,7 +126,7 @@ do { \
#define DEV_MESSAGE(d_loglevel,d_device,d_string,d_args...)\ #define DEV_MESSAGE(d_loglevel,d_device,d_string,d_args...)\
do { \ do { \
printk(d_loglevel PRINTK_HEADER " %s: " d_string "\n", \ 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); \ DBF_DEV_EVENT(DBF_ALERT, d_device, d_string, d_args); \
} while(0) } while(0)
...@@ -140,7 +140,7 @@ do { \ ...@@ -140,7 +140,7 @@ do { \
#define DEV_MESSAGE_LOG(d_loglevel,d_device,d_string,d_args...)\ #define DEV_MESSAGE_LOG(d_loglevel,d_device,d_string,d_args...)\
do { \ do { \
printk(d_loglevel PRINTK_HEADER " %s: " d_string "\n", \ 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) } while(0)
#define MESSAGE_LOG(d_loglevel,d_string,d_args...)\ #define MESSAGE_LOG(d_loglevel,d_string,d_args...)\
......
...@@ -67,7 +67,7 @@ dasd_devices_show(struct seq_file *m, void *v) ...@@ -67,7 +67,7 @@ dasd_devices_show(struct seq_file *m, void *v)
return 0; return 0;
} }
/* Print device number. */ /* Print device number. */
seq_printf(m, "%s", device->cdev->dev.bus_id); seq_printf(m, "%s", dev_name(&device->cdev->dev));
/* Print discipline string. */ /* Print discipline string. */
if (device != NULL && device->discipline != NULL) if (device != NULL && device->discipline != NULL)
seq_printf(m, "(%s)", device->discipline->name); seq_printf(m, "(%s)", device->discipline->name);
......
...@@ -91,7 +91,7 @@ static struct rw_semaphore dcssblk_devices_sem; ...@@ -91,7 +91,7 @@ static struct rw_semaphore dcssblk_devices_sem;
static void static void
dcssblk_release_segment(struct device *dev) 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)); kfree(container_of(dev, struct dcssblk_dev_info, dev));
module_put(THIS_MODULE); module_put(THIS_MODULE);
} }
...@@ -602,7 +602,8 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio) ...@@ -602,7 +602,8 @@ dcssblk_make_request(struct request_queue *q, struct bio *bio)
case SEG_TYPE_SC: case SEG_TYPE_SC:
/* cannot write to these segments */ /* cannot write to these segments */
if (bio_data_dir(bio) == WRITE) { 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; goto fail;
} }
} }
......
...@@ -910,7 +910,7 @@ tape_3590_erp_swap(struct tape_device *device, struct tape_request *request, ...@@ -910,7 +910,7 @@ tape_3590_erp_swap(struct tape_device *device, struct tape_request *request,
* should proceed with the new tape... this * should proceed with the new tape... this
* should probably be done in user space! * 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); 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) ...@@ -1003,40 +1003,43 @@ tape_3590_print_mim_msg_f0(struct tape_device *device, struct irb *irb)
/* Exception Message */ /* Exception Message */
switch (sense->fmt.f70.emc) { switch (sense->fmt.f70.emc) {
case 0x02: 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; break;
case 0x03: case 0x03:
PRINT_WARN("(%s): Data degraded in partion %i\n", 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; break;
case 0x04: 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; break;
case 0x05: case 0x05:
PRINT_WARN("(%s): Medium degraded in partition %i\n", PRINT_WARN("(%s): Medium degraded in partition %i\n",