aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_scan.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
-rw-r--r--drivers/scsi/scsi_scan.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index e8f6fee34c94..7eb3a2d40dc5 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1189,9 +1189,8 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
1189 num_luns = max_scsi_report_luns; 1189 num_luns = max_scsi_report_luns;
1190 } 1190 }
1191 1191
1192 SCSI_LOG_SCAN_BUS(3, printk (KERN_INFO "scsi scan: REPORT LUN scan of" 1192 SCSI_LOG_SCAN_BUS(3, sdev_printk (KERN_INFO, sdev,
1193 " host %d channel %d id %d\n", sdev->host->host_no, 1193 "scsi scan: REPORT LUN scan\n"));
1194 sdev->channel, sdev->id));
1195 1194
1196 /* 1195 /*
1197 * Scan the luns in lun_data. The entry at offset 0 is really 1196 * Scan the luns in lun_data. The entry at offset 0 is really
@@ -1230,9 +1229,10 @@ static int scsi_report_lun_scan(struct scsi_target *starget, int bflags,
1230 /* 1229 /*
1231 * Got some results, but now none, abort. 1230 * Got some results, but now none, abort.
1232 */ 1231 */
1233 printk(KERN_ERR "scsi: Unexpected response" 1232 sdev_printk(KERN_ERR, sdev,
1234 " from %s lun %d while scanning, scan" 1233 "Unexpected response"
1235 " aborted\n", devname, lun); 1234 " from lun %d while scanning, scan"
1235 " aborted\n", lun);
1236 break; 1236 break;
1237 } 1237 }
1238 } 1238 }
@@ -1417,8 +1417,9 @@ static void scsi_scan_channel(struct Scsi_Host *shost, unsigned int channel,
1417int scsi_scan_host_selected(struct Scsi_Host *shost, unsigned int channel, 1417int scsi_scan_host_selected(struct Scsi_Host *shost, unsigned int channel,
1418 unsigned int id, unsigned int lun, int rescan) 1418 unsigned int id, unsigned int lun, int rescan)
1419{ 1419{
1420 SCSI_LOG_SCAN_BUS(3, printk (KERN_INFO "%s: <%u:%u:%u:%u>\n", 1420 SCSI_LOG_SCAN_BUS(3, shost_printk (KERN_INFO, shost,
1421 __FUNCTION__, shost->host_no, channel, id, lun)); 1421 "%s: <%u:%u:%u>\n",
1422 __FUNCTION__, channel, id, lun));
1422 1423
1423 if (((channel != SCAN_WILD_CARD) && (channel > shost->max_channel)) || 1424 if (((channel != SCAN_WILD_CARD) && (channel > shost->max_channel)) ||
1424 ((id != SCAN_WILD_CARD) && (id > shost->max_id)) || 1425 ((id != SCAN_WILD_CARD) && (id > shost->max_id)) ||