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

3 files changed, 4 insertions, 6 deletions

diff --git a/drivers/s390/cio/ccwgroup.c b/drivers/s390/cio/ccwgroup.c
index e17b462ace03..3ac2c2019f5e 100644
--- a/drivers/s390/cio/ccwgroup.c
+++ b/drivers/s390/cio/ccwgroup.c
@@ -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)
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c
index f1216cf6fa8f..1246f61a5338 100644
--- a/drivers/s390/cio/chp.c
+++ b/drivers/s390/cio/chp.c
@@ -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);
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 1261e1a9e8cd..76bbb1e74c29 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -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);