[SCSI] struct device - replace bus_id with dev_name(), dev_set_name()

[jejb: limit ioctl to returning 20 characters to avoid overrun
       on long device names and add a few more conversions]
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 5 insertions, 7 deletions

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);