9 files changed, 13 insertions, 17 deletions

diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c
index 2aca79e952b0..ea4272c8c677 100644
--- a/drivers/s390/block/dcssblk.c
+++ b/drivers/s390/block/dcssblk.c
@@ -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);
 
diff --git a/drivers/s390/char/vmlogrdr.c b/drivers/s390/char/vmlogrdr.c
index 036e650e8b9c..42173cc34610 100644
--- a/drivers/s390/char/vmlogrdr.c
+++ b/drivers/s390/char/vmlogrdr.c
@@ -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;
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);
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 62b6b55230d0..326db1e827c4 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -892,8 +892,8 @@ static void ap_scan_bus(struct work_struct *unused)
 
                 ap_dev->device.bus = &ap_bus_type;
                 ap_dev->device.parent = ap_root_device;
-                snprintf(ap_dev->device.bus_id, BUS_ID_SIZE, "card%02x",
-                         AP_QID_DEVICE(ap_dev->qid));
+                dev_set_name(&ap_dev->device, "card%02x",
+                             AP_QID_DEVICE(ap_dev->qid));
                 ap_dev->device.release = ap_device_release;
                 rc = device_register(&ap_dev->device);
                 if (rc) {
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 9242b5acc66b..0fea51e34b57 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -1724,7 +1724,7 @@ static int netiucv_register_device(struct net_device *ndev)
         IUCV_DBF_TEXT(trace, 3, __func__);
 
         if (dev) {
-                snprintf(dev->bus_id, BUS_ID_SIZE, "net%s", ndev->name);
+                dev_set_name(dev, "net%s", ndev->name);
                 dev->bus = &iucv_bus;
                 dev->parent = iucv_root;
                 /*
diff --git a/drivers/s390/s390_rdev.c b/drivers/s390/s390_rdev.c
index 3c7145d9f9a1..64371c05a3b3 100644
--- a/drivers/s390/s390_rdev.c
+++ b/drivers/s390/s390_rdev.c
@@ -30,7 +30,7 @@ s390_root_dev_register(const char *name)
         dev = kzalloc(sizeof(struct device), GFP_KERNEL);
         if (!dev)
                 return ERR_PTR(-ENOMEM);
-        strncpy(dev->bus_id, name, min(strlen(name), (size_t)BUS_ID_SIZE));
+        dev_set_name(dev, name);
         dev->release = s390_root_dev_release;
         ret = device_register(dev);
         if (ret) {
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 24255e42dc30..3b56220fb900 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -283,8 +283,8 @@ struct zfcp_unit *zfcp_unit_enqueue(struct zfcp_port *port, u64 fcp_lun)
         unit->port = port;
         unit->fcp_lun = fcp_lun;
 
-        snprintf(unit->sysfs_device.bus_id, BUS_ID_SIZE, "0x%016llx",
-                 (unsigned long long) fcp_lun);
+        dev_set_name(&unit->sysfs_device, "0x%016llx",
+                     (unsigned long long) fcp_lun);
         unit->sysfs_device.parent = &port->sysfs_device;
         unit->sysfs_device.release = zfcp_sysfs_unit_release;
         dev_set_drvdata(&unit->sysfs_device, unit);
@@ -610,8 +610,7 @@ struct zfcp_port *zfcp_port_enqueue(struct zfcp_adapter *adapter, u64 wwpn,
         atomic_set_mask(status | ZFCP_STATUS_COMMON_REMOVE, &port->status);
         atomic_set(&port->refcount, 0);
 
-        snprintf(port->sysfs_device.bus_id, BUS_ID_SIZE, "0x%016llx",
-                 (unsigned long long) wwpn);
+        dev_set_name(&port->sysfs_device, "0x%016llx", wwpn);
         port->sysfs_device.parent = &adapter->ccw_device->dev;
 
         port->sysfs_device.release = zfcp_sysfs_port_release;