1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 17914a346f71..66505bb79410 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -414,8 +414,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
@@ -1024,7 +1023,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
@@ -1163,7 +1162,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);
         /*