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

Commit 1bf5b285 authored by Cornelia Huck's avatar Cornelia Huck Committed by Martin Schwidefsky
Browse files

[S390] bus_id -> dev_set_name() changes 



Convert most s390 users setting bus_id to dev_set_name().
css and ccw busses are deferred since they need some special
treatment.

Signed-off-by: default avatarCornelia 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 2a0217d5

drivers/s390/block/dcssblk.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ dcssblk_add_store(struct device *dev, struct device_attribute *attr, const char 
	}



	strcpy(dev_info->segment_name, local_buf);

	strlcpy(dev_info->dev.bus_id, local_buf, BUS_ID_SIZE);

	dev_set_name(&dev_info->dev, local_buf);

	dev_info->dev.release = dcssblk_release_segment;

	INIT_LIST_HEAD(&dev_info->lh);

drivers/s390/char/vmlogrdr.c

+1 −2
Original line number Diff line number Diff line
@@ -724,8 +724,7 @@ static int vmlogrdr_register_device(struct vmlogrdr_priv_t *priv) 


	dev = kzalloc(sizeof(struct device), GFP_KERNEL);

	if (dev) {

		snprintf(dev->bus_id, BUS_ID_SIZE, "%s",

			 priv->internal_name);

		dev_set_name(dev, priv->internal_name);

		dev->bus = &iucv_bus;

		dev->parent = iucv_root;

		dev->driver = &vmlogrdr_driver;

drivers/s390/cio/ccwgroup.c

+1 −2
Original line number Diff line number Diff line
@@ -269,8 +269,7 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id, 
		goto error;

	}



	snprintf (gdev->dev.bus_id, BUS_ID_SIZE, "%s",

			dev_name(&gdev->cdev[0]->dev));

	dev_set_name(&gdev->dev, "%s", dev_name(&gdev->cdev[0]->dev));



	rc = device_add(&gdev->dev);

	if (rc)

drivers/s390/cio/chp.c

+1 −2
Original line number Diff line number Diff line
@@ -393,8 +393,7 @@ int chp_new(struct chp_id chpid) 
	chp->state = 1;

	chp->dev.parent = &channel_subsystems[chpid.cssid]->device;

	chp->dev.release = chp_release;

	snprintf(chp->dev.bus_id, BUS_ID_SIZE, "chp%x.%02x", chpid.cssid,

		 chpid.id);

	dev_set_name(&chp->dev, "chp%x.%02x", chpid.cssid, chpid.id);



	/* Obtain channel path description and fill it in. */

	ret = chsc_determine_base_channel_path_desc(chpid, &chp->desc);

drivers/s390/cio/css.c

+2 −2
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ static int __init setup_css(int nr) 
		return -ENOMEM;

	css->pseudo_subchannel->dev.parent = &css->device;

	css->pseudo_subchannel->dev.release = css_subchannel_release;

	sprintf(css->pseudo_subchannel->dev.bus_id, "defunct");

	dev_set_name(&css->pseudo_subchannel->dev, "defunct");

	ret = cio_create_sch_lock(css->pseudo_subchannel);

	if (ret) {

		kfree(css->pseudo_subchannel);
@@ -707,7 +707,7 @@ static int __init setup_css(int nr) 
	mutex_init(&css->mutex);

	css->valid = 1;

	css->cssid = nr;

	sprintf(css->device.bus_id, "css%x", nr);

	dev_set_name(&css->device, "css%x", nr);

	css->device.release = channel_subsystem_release;

	tod_high = (u32) (get_clock() >> 32);

	css_generate_pgid(css, tod_high);