25 files changed, 75 insertions, 77 deletions

diff --git a/drivers/scsi/NCR_D700.c b/drivers/scsi/NCR_D700.c
index 9e64b21ef637..c889d8458684 100644
--- a/drivers/scsi/NCR_D700.c
+++ b/drivers/scsi/NCR_D700.c
@@ -318,7 +318,7 @@ NCR_D700_probe(struct device *dev)
                 return -ENOMEM;
 
         p->dev = dev;
-        snprintf(p->name, sizeof(p->name), "D700(%s)", dev->bus_id);
+        snprintf(p->name, sizeof(p->name), "D700(%s)", dev_name(dev));
         if (request_irq(irq, NCR_D700_intr, IRQF_SHARED, p->name, p)) {
                 printk(KERN_ERR "D700: request_irq failed\n");
                 kfree(p);
diff --git a/drivers/scsi/advansys.c b/drivers/scsi/advansys.c
index 2f602720193e..7507d8bc57a1 100644
--- a/drivers/scsi/advansys.c
+++ b/drivers/scsi/advansys.c
@@ -2527,7 +2527,7 @@ static void asc_prt_scsi_host(struct Scsi_Host *s)
 {
         struct asc_board *boardp = shost_priv(s);
 
-        printk("Scsi_Host at addr 0x%p, device %s\n", s, boardp->dev->bus_id);
+        printk("Scsi_Host at addr 0x%p, device %s\n", s, dev_name(boardp->dev));
         printk(" host_busy %u, host_no %d, last_reset %d,\n",
                s->host_busy, s->host_no, (unsigned)s->last_reset);
 
diff --git a/drivers/scsi/aic94xx/aic94xx_tmf.c b/drivers/scsi/aic94xx/aic94xx_tmf.c
index d4640ef6d44f..78eb86fc6276 100644
--- a/drivers/scsi/aic94xx/aic94xx_tmf.c
+++ b/drivers/scsi/aic94xx/aic94xx_tmf.c
@@ -189,7 +189,7 @@ int asd_I_T_nexus_reset(struct domain_device *dev)
         asd_clear_nexus_I_T(dev, NEXUS_PHASE_PRE);
         /* send a hard reset */
         ASD_DPRINTK("sending %s reset to %s\n",
-                    reset_type ? "hard" : "soft", phy->dev.bus_id);
+                    reset_type ? "hard" : "soft", dev_name(&phy->dev));
         res = sas_phy_reset(phy, reset_type);
         if (res == TMF_RESP_FUNC_COMPLETE) {
                 /* wait for the maximum settle time */
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 3fdbb13e80a8..aa670a1d1513 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -388,8 +388,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
                 shost->dma_boundary = 0xffffffff;
 
         device_initialize(&shost->shost_gendev);
-        snprintf(shost->shost_gendev.bus_id, BUS_ID_SIZE, "host%d",
-                shost->host_no);
+        dev_set_name(&shost->shost_gendev, "host%d", shost->host_no);
 #ifndef CONFIG_SYSFS_DEPRECATED
         shost->shost_gendev.bus = &scsi_bus_type;
 #endif
@@ -398,8 +397,7 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize)
         device_initialize(&shost->shost_dev);
         shost->shost_dev.parent = &shost->shost_gendev;
         shost->shost_dev.class = &shost_class;
-        snprintf(shost->shost_dev.bus_id, BUS_ID_SIZE, "host%d",
-                 shost->host_no);
+        dev_set_name(&shost->shost_dev, "host%d", shost->host_no);
         shost->shost_dev.groups = scsi_sysfs_shost_attr_groups;
 
         shost->ehandler = kthread_run(scsi_error_handler, shost,
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 44f202f33101..253414e190a7 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -1145,10 +1145,10 @@ static void ibmvfc_set_login_info(struct ibmvfc_host *vhost)
         login_info->async.len = vhost->async_crq.size * sizeof(*vhost->async_crq.msgs);
         strncpy(login_info->partition_name, vhost->partition_name, IBMVFC_MAX_NAME);
         strncpy(login_info->device_name,
-                vhost->host->shost_gendev.bus_id, IBMVFC_MAX_NAME);
+                dev_name(&vhost->host->shost_gendev), IBMVFC_MAX_NAME);
 
         location = of_get_property(of_node, "ibm,loc-code", NULL);
-        location = location ? location : vhost->dev->bus_id;
+        location = location ? location : dev_name(vhost->dev);
         strncpy(login_info->drc_name, location, IBMVFC_MAX_NAME);
 }
 
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 0edfb1fa63ce..841f460edbc4 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -2184,7 +2184,7 @@ static void ipr_dump_location_data(struct ipr_ioa_cfg *ioa_cfg,
                 sizeof(struct ipr_dump_entry_header);
         driver_dump->location_entry.hdr.data_type = IPR_DUMP_DATA_TYPE_ASCII;
         driver_dump->location_entry.hdr.id = IPR_DUMP_LOCATION_ID;
-        strcpy(driver_dump->location_entry.location, ioa_cfg->pdev->dev.bus_id);
+        strcpy(driver_dump->location_entry.location, dev_name(&ioa_cfg->pdev->dev));
         driver_dump->hdr.num_entries++;
 }
 
diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 59459141b437..8f872f816fe4 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -1272,7 +1272,7 @@ struct ipr_dump_entry_header {
 
 struct ipr_dump_location_entry {
         struct ipr_dump_entry_header hdr;
-        u8 location[BUS_ID_SIZE];
+        u8 location[20];
 }__attribute__((packed));
 
 struct ipr_dump_trace_entry {
diff --git a/drivers/scsi/lasi700.c b/drivers/scsi/lasi700.c
index 3126824da36d..4a4e6954ec79 100644
--- a/drivers/scsi/lasi700.c
+++ b/drivers/scsi/lasi700.c
@@ -103,8 +103,7 @@ lasi700_probe(struct parisc_device *dev)
 
         hostdata = kzalloc(sizeof(*hostdata), GFP_KERNEL);
         if (!hostdata) {
-                printk(KERN_ERR "%s: Failed to allocate host data\n",
-                       dev->dev.bus_id);
+                dev_printk(KERN_ERR, dev, "Failed to allocate host data\n");
                 return -ENOMEM;
         }
 
diff --git a/drivers/scsi/libsas/sas_discover.c b/drivers/scsi/libsas/sas_discover.c
index 709a6f75ca9d..facc5bfcf7db 100644
--- a/drivers/scsi/libsas/sas_discover.c
+++ b/drivers/scsi/libsas/sas_discover.c
@@ -169,7 +169,7 @@ int sas_notify_lldd_dev_found(struct domain_device *dev)
                 if (res) {
                         printk("sas: driver on pcidev %s cannot handle "
                                "device %llx, error:%d\n",
-                               sas_ha->dev->bus_id,
+                               dev_name(sas_ha->dev),
                                SAS_ADDR(dev->sas_addr), res);
                 }
         }
diff --git a/drivers/scsi/libsas/sas_dump.c b/drivers/scsi/libsas/sas_dump.c
index bf34a236f946..c17c25030f1c 100644
--- a/drivers/scsi/libsas/sas_dump.c
+++ b/drivers/scsi/libsas/sas_dump.c
@@ -56,7 +56,7 @@ void sas_dprint_phye(int phyid, enum phy_event pe)
 
 void sas_dprint_hae(struct sas_ha_struct *sas_ha, enum ha_event he)
 {
-        SAS_DPRINTK("ha %s: %s event\n", sas_ha->dev->bus_id,
+        SAS_DPRINTK("ha %s: %s event\n", dev_name(sas_ha->dev),
                     sas_hae_str[he]);
 }
 
diff --git a/drivers/scsi/libsas/sas_port.c b/drivers/scsi/libsas/sas_port.c
index 139935a121b4..e6ac59c023f1 100644
--- a/drivers/scsi/libsas/sas_port.c
+++ b/drivers/scsi/libsas/sas_port.c
@@ -113,7 +113,7 @@ static void sas_form_port(struct asd_sas_phy *phy)
         sas_port_add_phy(port->port, phy->phy);
 
         SAS_DPRINTK("%s added to %s, phy_mask:0x%x (%16llx)\n",
-                    phy->phy->dev.bus_id,port->port->dev.bus_id,
+                    dev_name(&phy->phy->dev), dev_name(&port->port->dev),
                     port->phy_mask,
                     SAS_ADDR(port->attached_sas_addr));
 
diff --git a/drivers/scsi/raid_class.c b/drivers/scsi/raid_class.c
index 913a931176ef..8e5c169b03fb 100644
--- a/drivers/scsi/raid_class.c
+++ b/drivers/scsi/raid_class.c
@@ -237,8 +237,7 @@ int raid_component_add(struct raid_template *r,struct device *raid_dev,
         rc->dev.parent = get_device(component_dev);
         rc->num = rd->component_count++;
 
-        snprintf(rc->dev.bus_id, sizeof(rc->dev.bus_id),
-                 "component-%d", rc->num);
+        dev_set_name(&rc->dev, "component-%d", rc->num);
         list_add_tail(&rc->node, &rd->component_list);
         rc->dev.class = &raid_class.class;
         err = device_add(&rc->dev);
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
index 27c633f55794..6eebd0bbe8a8 100644
--- a/drivers/scsi/scsi_debug.c
+++ b/drivers/scsi/scsi_debug.c
@@ -2508,7 +2508,7 @@ static void pseudo_0_release(struct device *dev)
 }
 
 static struct device pseudo_primary = {
-        .bus_id         = "pseudo_0",
+        .init_name      = "pseudo_0",
         .release        = pseudo_0_release,
 };
 
@@ -2680,7 +2680,7 @@ static int sdebug_add_adapter(void)
         sdbg_host->dev.bus = &pseudo_lld_bus;
         sdbg_host->dev.parent = &pseudo_primary;
         sdbg_host->dev.release = &sdebug_release_adapter;
-        sprintf(sdbg_host->dev.bus_id, "adapter%d", scsi_debug_add_host);
+        dev_set_name(&sdbg_host->dev, "adapter%d", scsi_debug_add_host);
 
         error = device_register(&sdbg_host->dev);
 
diff --git a/drivers/scsi/scsi_ioctl.c b/drivers/scsi/scsi_ioctl.c
index 2ae4f8fc5831..b98f763931c5 100644
--- a/drivers/scsi/scsi_ioctl.c
+++ b/drivers/scsi/scsi_ioctl.c
@@ -167,10 +167,17 @@ EXPORT_SYMBOL(scsi_set_medium_removal);
 static int scsi_ioctl_get_pci(struct scsi_device *sdev, void __user *arg)
 {
         struct device *dev = scsi_get_device(sdev->host);
+        const char *name;
 
         if (!dev)
                 return -ENXIO;
-        return copy_to_user(arg, dev->bus_id, sizeof(dev->bus_id))? -EFAULT: 0;
+
+        name = dev_name(dev);
+
+        /* compatibility with old ioctl which only returned
+         * 20 characters */
+        return copy_to_user(arg, name, min(strlen(name), (size_t)20))
+                ? -EFAULT: 0;
 }
 
 
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 18486b51668d..f8493f219bc9 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -411,8 +411,7 @@ static struct scsi_target *scsi_alloc_target(struct device *parent,
         device_initialize(dev);
         starget->reap_ref = 1;
         dev->parent = get_device(parent);
-        sprintf(dev->bus_id, "target%d:%d:%d",
-                shost->host_no, channel, id);
+        dev_set_name(dev, "target%d:%d:%d", shost->host_no, channel, id);
 #ifndef CONFIG_SYSFS_DEPRECATED
         dev->bus = &scsi_bus_type;
 #endif
@@ -1021,7 +1020,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
                 if (rescan || !scsi_device_created(sdev)) {
                         SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO
                                 "scsi scan: device exists on %s\n",
-                                sdev->sdev_gendev.bus_id));
+                                dev_name(&sdev->sdev_gendev)));
                         if (sdevp)
                                 *sdevp = sdev;
                         else
@@ -1160,7 +1159,7 @@ static void scsi_sequential_lun_scan(struct scsi_target *starget,
         struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
 
         SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO "scsi scan: Sequential scan of"
-                                    "%s\n", starget->dev.bus_id));
+                                    "%s\n", dev_name(&starget->dev)));
 
         max_dev_lun = min(max_scsi_luns, shost->max_lun);
         /*
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 93c28f30bbd7..da63802cbf9d 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -1079,16 +1079,14 @@ void scsi_sysfs_device_initialize(struct scsi_device *sdev)
         device_initialize(&sdev->sdev_gendev);
         sdev->sdev_gendev.bus = &scsi_bus_type;
         sdev->sdev_gendev.type = &scsi_dev_type;
-        sprintf(sdev->sdev_gendev.bus_id,"%d:%d:%d:%d",
-                sdev->host->host_no, sdev->channel, sdev->id,
-                sdev->lun);
-        
+        dev_set_name(&sdev->sdev_gendev, "%d:%d:%d:%d",
+                     sdev->host->host_no, sdev->channel, sdev->id, sdev->lun);
+
         device_initialize(&sdev->sdev_dev);
         sdev->sdev_dev.parent = &sdev->sdev_gendev;
         sdev->sdev_dev.class = &sdev_class;
-        snprintf(sdev->sdev_dev.bus_id, BUS_ID_SIZE,
-                 "%d:%d:%d:%d", sdev->host->host_no,
-                 sdev->channel, sdev->id, sdev->lun);
+        dev_set_name(&sdev->sdev_dev, "%d:%d:%d:%d",
+                     sdev->host->host_no, sdev->channel, sdev->id, sdev->lun);
         sdev->scsi_level = starget->scsi_level;
         transport_setup_device(&sdev->sdev_gendev);
         spin_lock_irqsave(shost->host_lock, flags);
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 062304de4854..dcef78776503 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -2486,8 +2486,8 @@ fc_rport_create(struct Scsi_Host *shost, int channel,
         device_initialize(dev);                 /* takes self reference */
         dev->parent = get_device(&shost->shost_gendev); /* parent reference */
         dev->release = fc_rport_dev_release;
-        sprintf(dev->bus_id, "rport-%d:%d-%d",
-                shost->host_no, channel, rport->number);
+        dev_set_name(dev, "rport-%d:%d-%d",
+                     shost->host_no, channel, rport->number);
         transport_setup_device(dev);
 
         error = device_add(dev);
@@ -3164,8 +3164,8 @@ fc_vport_setup(struct Scsi_Host *shost, int channel, struct device *pdev,
         device_initialize(dev);                 /* takes self reference */
         dev->parent = get_device(pdev);         /* takes parent reference */
         dev->release = fc_vport_dev_release;
-        sprintf(dev->bus_id, "vport-%d:%d-%d",
-                shost->host_no, channel, vport->number);
+        dev_set_name(dev, "vport-%d:%d-%d",
+                     shost->host_no, channel, vport->number);
         transport_setup_device(dev);
 
         error = device_add(dev);
@@ -3188,19 +3188,19 @@ fc_vport_setup(struct Scsi_Host *shost, int channel, struct device *pdev,
          */
         if (pdev != &shost->shost_gendev) {
                 error = sysfs_create_link(&shost->shost_gendev.kobj,
-                                 &dev->kobj, dev->bus_id);
+                                 &dev->kobj, dev_name(dev));
                 if (error)
                         printk(KERN_ERR
                                 "%s: Cannot create vport symlinks for "
                                 "%s, err=%d\n",
-                                __func__, dev->bus_id, error);
+                                __func__, dev_name(dev), error);
         }
         spin_lock_irqsave(shost->host_lock, flags);
         vport->flags &= ~FC_VPORT_CREATING;
         spin_unlock_irqrestore(shost->host_lock, flags);
 
         dev_printk(KERN_NOTICE, pdev,
-                        "%s created via shost%d channel %d\n", dev->bus_id,
+                        "%s created via shost%d channel %d\n", dev_name(dev),
                         shost->host_no, channel);
 
         *ret_vport = vport;
@@ -3297,7 +3297,7 @@ fc_vport_terminate(struct fc_vport *vport)
                 return stat;
 
         if (dev->parent != &shost->shost_gendev)
-                sysfs_remove_link(&shost->shost_gendev.kobj, dev->bus_id);
+                sysfs_remove_link(&shost->shost_gendev.kobj, dev_name(dev));
         transport_remove_device(dev);
         device_del(dev);
         transport_destroy_device(dev);
@@ -3329,7 +3329,7 @@ fc_vport_sched_delete(struct work_struct *work)
                 dev_printk(KERN_ERR, vport->dev.parent,
                         "%s: %s could not be deleted created via "
                         "shost%d channel %d - error %d\n", __func__,
-                        vport->dev.bus_id, vport->shost->host_no,
+                        dev_name(&vport->dev), vport->shost->host_no,
                         vport->channel, stat);
 }
 
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 4a803ebaf508..75c9297694cb 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -187,8 +187,7 @@ iscsi_create_endpoint(int dd_size)
 
         ep->id = id;
         ep->dev.class = &iscsi_endpoint_class;
-        snprintf(ep->dev.bus_id, BUS_ID_SIZE, "ep-%llu",
-                 (unsigned long long) id);
+        dev_set_name(&ep->dev, "ep-%llu", (unsigned long long) id);
         err = device_register(&ep->dev);
         if (err)
                 goto free_ep;
@@ -724,8 +723,7 @@ int iscsi_add_session(struct iscsi_cls_session *session, unsigned int target_id)
         }
         session->target_id = id;
 
-        snprintf(session->dev.bus_id, BUS_ID_SIZE, "session%u",
-                 session->sid);
+        dev_set_name(&session->dev, "session%u", session->sid);
         err = device_add(&session->dev);
         if (err) {
                 iscsi_cls_session_printk(KERN_ERR, session,
@@ -898,8 +896,7 @@ iscsi_create_conn(struct iscsi_cls_session *session, int dd_size, uint32_t cid)
         if (!get_device(&session->dev))
                 goto free_conn;
 
-        snprintf(conn->dev.bus_id, BUS_ID_SIZE, "connection%d:%u",
-                 session->sid, cid);
+        dev_set_name(&conn->dev, "connection%d:%u", session->sid, cid);
         conn->dev.parent = &session->dev;
         conn->dev.release = iscsi_conn_release;
         err = device_register(&conn->dev);
@@ -1816,7 +1813,7 @@ iscsi_register_transport(struct iscsi_transport *tt)
                 priv->t.create_work_queue = 1;
 
         priv->dev.class = &iscsi_transport_class;
-        snprintf(priv->dev.bus_id, BUS_ID_SIZE, "%s", tt->name);
+        dev_set_name(&priv->dev, "%s", tt->name);
         err = device_register(&priv->dev);
         if (err)
                 goto free_priv;
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index 366609386be1..50988cbf7b2d 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -207,7 +207,7 @@ static int sas_bsg_initialize(struct Scsi_Host *shost, struct sas_rphy *rphy)
         struct request_queue *q;
         int error;
         struct device *dev;
-        char namebuf[BUS_ID_SIZE];
+        char namebuf[20];
         const char *name;
         void (*release)(struct device *);
 
@@ -219,7 +219,7 @@ static int sas_bsg_initialize(struct Scsi_Host *shost, struct sas_rphy *rphy)
         if (rphy) {
                 q = blk_init_queue(sas_non_host_smp_request, NULL);
                 dev = &rphy->dev;
-                name = dev->bus_id;
+                name = dev_name(dev);
                 release = NULL;
         } else {
                 q = blk_init_queue(sas_host_smp_request, NULL);
@@ -629,10 +629,10 @@ struct sas_phy *sas_phy_alloc(struct device *parent, int number)
         INIT_LIST_HEAD(&phy->port_siblings);
         if (scsi_is_sas_expander_device(parent)) {
                 struct sas_rphy *rphy = dev_to_rphy(parent);
-                sprintf(phy->dev.bus_id, "phy-%d:%d:%d", shost->host_no,
+                dev_set_name(&phy->dev, "phy-%d:%d:%d", shost->host_no,
                         rphy->scsi_target_id, number);
         } else
-                sprintf(phy->dev.bus_id, "phy-%d:%d", shost->host_no, number);
+                dev_set_name(&phy->dev, "phy-%d:%d", shost->host_no, number);
 
         transport_setup_device(&phy->dev);
 
@@ -770,7 +770,7 @@ static void sas_port_create_link(struct sas_port *port,
         int res;
 
         res = sysfs_create_link(&port->dev.kobj, &phy->dev.kobj,
-                                phy->dev.bus_id);
+                                dev_name(&phy->dev));
         if (res)
                 goto err;
         res = sysfs_create_link(&phy->dev.kobj, &port->dev.kobj, "port");
@@ -785,7 +785,7 @@ err:
 static void sas_port_delete_link(struct sas_port *port,
                                  struct sas_phy *phy)
 {
-        sysfs_remove_link(&port->dev.kobj, phy->dev.bus_id);
+        sysfs_remove_link(&port->dev.kobj, dev_name(&phy->dev));
         sysfs_remove_link(&phy->dev.kobj, "port");
 }
 
@@ -821,11 +821,11 @@ struct sas_port *sas_port_alloc(struct device *parent, int port_id)
 
         if (scsi_is_sas_expander_device(parent)) {
                 struct sas_rphy *rphy = dev_to_rphy(parent);
-                sprintf(port->dev.bus_id, "port-%d:%d:%d", shost->host_no,
-                        rphy->scsi_target_id, port->port_identifier);
+                dev_set_name(&port->dev, "port-%d:%d:%d", shost->host_no,
+                             rphy->scsi_target_id, port->port_identifier);
         } else
-                sprintf(port->dev.bus_id, "port-%d:%d", shost->host_no,
-                        port->port_identifier);
+                dev_set_name(&port->dev, "port-%d:%d", shost->host_no,
+                             port->port_identifier);
 
         transport_setup_device(&port->dev);
 
@@ -935,7 +935,7 @@ void sas_port_delete(struct sas_port *port)
         if (port->is_backlink) {
                 struct device *parent = port->dev.parent;
 
-                sysfs_remove_link(&port->dev.kobj, parent->bus_id);
+                sysfs_remove_link(&port->dev.kobj, dev_name(parent));
                 port->is_backlink = 0;
         }
 
@@ -984,7 +984,8 @@ void sas_port_add_phy(struct sas_port *port, struct sas_phy *phy)
                 /* If this trips, you added a phy that was already
                  * part of a different port */
                 if (unlikely(tmp != phy)) {
-                        dev_printk(KERN_ERR, &port->dev, "trying to add phy %s fails: it's already part of another port\n", phy->dev.bus_id);
+                        dev_printk(KERN_ERR, &port->dev, "trying to add phy %s fails: it's already part of another port\n",
+                                   dev_name(&phy->dev));
                         BUG();
                 }
         } else {
@@ -1023,7 +1024,7 @@ void sas_port_mark_backlink(struct sas_port *port)
                 return;
         port->is_backlink = 1;
         res = sysfs_create_link(&port->dev.kobj, &parent->kobj,
-                                parent->bus_id);
+                                dev_name(parent));
         if (res)
                 goto err;
         return;
@@ -1367,11 +1368,12 @@ struct sas_rphy *sas_end_device_alloc(struct sas_port *parent)
         rdev->rphy.dev.release = sas_end_device_release;
         if (scsi_is_sas_expander_device(parent->dev.parent)) {
                 struct sas_rphy *rphy = dev_to_rphy(parent->dev.parent);
-                sprintf(rdev->rphy.dev.bus_id, "end_device-%d:%d:%d",
-                        shost->host_no, rphy->scsi_target_id, parent->port_identifier);
+                dev_set_name(&rdev->rphy.dev, "end_device-%d:%d:%d",
+                             shost->host_no, rphy->scsi_target_id,
+                             parent->port_identifier);
         } else
-                sprintf(rdev->rphy.dev.bus_id, "end_device-%d:%d",
-                        shost->host_no, parent->port_identifier);
+                dev_set_name(&rdev->rphy.dev, "end_device-%d:%d",
+                             shost->host_no, parent->port_identifier);
         rdev->rphy.identify.device_type = SAS_END_DEVICE;
         sas_rphy_initialize(&rdev->rphy);
         transport_setup_device(&rdev->rphy.dev);
@@ -1411,8 +1413,8 @@ struct sas_rphy *sas_expander_alloc(struct sas_port *parent,
         mutex_lock(&sas_host->lock);
         rdev->rphy.scsi_target_id = sas_host->next_expander_id++;
         mutex_unlock(&sas_host->lock);
-        sprintf(rdev->rphy.dev.bus_id, "expander-%d:%d",
-                shost->host_no, rdev->rphy.scsi_target_id);
+        dev_set_name(&rdev->rphy.dev, "expander-%d:%d",
+                     shost->host_no, rdev->rphy.scsi_target_id);
         rdev->rphy.identify.device_type = type;
         sas_rphy_initialize(&rdev->rphy);
         transport_setup_device(&rdev->rphy.dev);
@@ -1445,7 +1447,7 @@ int sas_rphy_add(struct sas_rphy *rphy)
         transport_add_device(&rphy->dev);
         transport_configure_device(&rphy->dev);
         if (sas_bsg_initialize(shost, rphy))
-                printk("fail to a bsg device %s\n", rphy->dev.bus_id);
+                printk("fail to a bsg device %s\n", dev_name(&rphy->dev));
 
 
         mutex_lock(&sas_host->lock);
diff --git a/drivers/scsi/scsi_transport_srp.c b/drivers/scsi/scsi_transport_srp.c
index 8a7af951d98a..21a045e0559f 100644
--- a/drivers/scsi/scsi_transport_srp.c
+++ b/drivers/scsi/scsi_transport_srp.c
@@ -212,7 +212,7 @@ struct srp_rport *srp_rport_add(struct Scsi_Host *shost,
         rport->roles = ids->roles;
 
         id = atomic_inc_return(&to_srp_host_attrs(shost)->next_port_id);
-        sprintf(rport->dev.bus_id, "port-%d:%d", shost->host_no, id);
+        dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
 
         transport_setup_device(&rport->dev);
 
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 62b28d58e65e..835aebf78710 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1876,7 +1876,7 @@ static int sd_probe(struct device *dev)
         device_initialize(&sdkp->dev);
         sdkp->dev.parent = &sdp->sdev_gendev;
         sdkp->dev.class = &sd_disk_class;
-        strncpy(sdkp->dev.bus_id, sdp->sdev_gendev.bus_id, BUS_ID_SIZE);
+        dev_set_name(&sdkp->dev, dev_name(&sdp->sdev_gendev));
 
         if (device_add(&sdkp->dev))
                 goto out_free_index;
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index 7f0df29f3a64..e946e05db7f7 100644
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -526,7 +526,7 @@ static int ses_intf_add(struct device *cdev,
         if (!scomp)
                 goto err_free;
 
-        edev = enclosure_register(cdev->parent, sdev->sdev_gendev.bus_id,
+        edev = enclosure_register(cdev->parent, dev_name(&sdev->sdev_gendev),
                                   components, &ses_enclosure_callbacks);
         if (IS_ERR(edev)) {
                 err = PTR_ERR(edev);
diff --git a/drivers/scsi/sim710.c b/drivers/scsi/sim710.c
index d63d229e2323..6dc8b846c112 100644
--- a/drivers/scsi/sim710.c
+++ b/drivers/scsi/sim710.c
@@ -102,7 +102,7 @@ sim710_probe_common(struct device *dev, unsigned long base_addr,
         struct NCR_700_Host_Parameters *hostdata =
                 kzalloc(sizeof(struct NCR_700_Host_Parameters), GFP_KERNEL);
 
-        printk(KERN_NOTICE "sim710: %s\n", dev->bus_id);
+        printk(KERN_NOTICE "sim710: %s\n", dev_name(dev));
         printk(KERN_NOTICE "sim710: irq = %d, clock = %d, base = 0x%lx, scsi_id = %d\n",
                irq, clock, base_addr, scsi_id);
 
@@ -305,7 +305,7 @@ sim710_eisa_probe(struct device *dev)
                 scsi_id = ffs(val) - 1;
 
                 if(scsi_id > 7 || (val & ~(1<<scsi_id)) != 0) {
-                        printk(KERN_ERR "sim710.c, EISA card %s has incorrect scsi_id, setting to 7\n", dev->bus_id);
+                        printk(KERN_ERR "sim710.c, EISA card %s has incorrect scsi_id, setting to 7\n", dev_name(dev));
                         scsi_id = 7;
                 }
         } else {
diff --git a/drivers/scsi/sni_53c710.c b/drivers/scsi/sni_53c710.c
index 2bbef4c45a0d..77f0b2cdaa94 100644
--- a/drivers/scsi/sni_53c710.c
+++ b/drivers/scsi/sni_53c710.c
@@ -78,8 +78,7 @@ static int __init snirm710_probe(struct platform_device *dev)
         base = res->start;
         hostdata = kzalloc(sizeof(*hostdata), GFP_KERNEL);
         if (!hostdata) {
-                printk(KERN_ERR "%s: Failed to allocate host data\n",
-                       dev->dev.bus_id);
+                dev_printk(KERN_ERR, dev, "Failed to allocate host data\n");
                 return -ENOMEM;
         }
 
diff --git a/drivers/scsi/zalon.c b/drivers/scsi/zalon.c
index 3c4a300494a4..a8d61a62522e 100644
--- a/drivers/scsi/zalon.c
+++ b/drivers/scsi/zalon.c
@@ -137,8 +137,8 @@ zalon_probe(struct parisc_device *dev)
                 goto fail;
 
         if (request_irq(dev->irq, ncr53c8xx_intr, IRQF_SHARED, "zalon", host)) {
-                printk(KERN_ERR "%s: irq problem with %d, detaching\n ",
-                        dev->dev.bus_id, dev->irq);
+          dev_printk(KERN_ERR, dev, "irq problem with %d, detaching\n ",
+                     dev->irq);
                 goto fail;
         }