aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_scan.c
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-12-03 16:41:36 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-01-02 11:22:16 -0500
commit71610f55fa4db63dbf5385929a47c9fb2451f332 (patch)
treeb816672eef25e1436111e6c78053612bd22fb016 /drivers/scsi/scsi_scan.c
parentb58602a4bac012b5f4fc12fe6b46ab237b610d5d (diff)
[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>
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
-rw-r--r--drivers/scsi/scsi_scan.c7
1 files changed, 3 insertions, 4 deletions
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,
411 device_initialize(dev); 411 device_initialize(dev);
412 starget->reap_ref = 1; 412 starget->reap_ref = 1;
413 dev->parent = get_device(parent); 413 dev->parent = get_device(parent);
414 sprintf(dev->bus_id, "target%d:%d:%d", 414 dev_set_name(dev, "target%d:%d:%d", shost->host_no, channel, id);
415 shost->host_no, channel, id);
416#ifndef CONFIG_SYSFS_DEPRECATED 415#ifndef CONFIG_SYSFS_DEPRECATED
417 dev->bus = &scsi_bus_type; 416 dev->bus = &scsi_bus_type;
418#endif 417#endif
@@ -1021,7 +1020,7 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget,
1021 if (rescan || !scsi_device_created(sdev)) { 1020 if (rescan || !scsi_device_created(sdev)) {
1022 SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO 1021 SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO
1023 "scsi scan: device exists on %s\n", 1022 "scsi scan: device exists on %s\n",
1024 sdev->sdev_gendev.bus_id)); 1023 dev_name(&sdev->sdev_gendev)));
1025 if (sdevp) 1024 if (sdevp)
1026 *sdevp = sdev; 1025 *sdevp = sdev;
1027 else 1026 else
@@ -1160,7 +1159,7 @@ static void scsi_sequential_lun_scan(struct scsi_target *starget,
1160 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent); 1159 struct Scsi_Host *shost = dev_to_shost(starget->dev.parent);
1161 1160
1162 SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO "scsi scan: Sequential scan of" 1161 SCSI_LOG_SCAN_BUS(3, printk(KERN_INFO "scsi scan: Sequential scan of"
1163 "%s\n", starget->dev.bus_id)); 1162 "%s\n", dev_name(&starget->dev)));
1164 1163
1165 max_dev_lun = min(max_scsi_luns, shost->max_lun); 1164 max_dev_lun = min(max_scsi_luns, shost->max_lun);
1166 /* 1165 /*