Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

drivers/s390/block/dasd.c

+16 −16
Original line number Diff line number Diff line
@@ -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. */

drivers/s390/block/dasd_3990_erp.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/s390/block/dasd_devmap.c

+14 −14
Original line number Diff line number Diff line
@@ -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);

drivers/s390/block/dasd_eckd.c

+3 −3
Original line number Diff line number Diff line
@@ -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++) {

drivers/s390/block/dasd_eer.c

+4 −2
Original line number Diff line number Diff line
@@ -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) {