aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sd.c
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@steeleye.com>2005-10-02 12:45:08 -0400
committerJames Bottomley <jejb@mulgrave.(none)>2005-10-28 15:23:02 -0400
commit9ccfc756a70d454dfa82f48897e2883560c01a0e (patch)
tree9a6d3b10b1ec0e5fe7a63252a21598a03e93ad4e /drivers/scsi/sd.c
parent9a41a62b74388827998253d62c58707e63cc5874 (diff)
[SCSI] move the mid-layer printk's over to shost/starget/sdev_printk
This should eliminate (at least in the mid layer) to make numeric assumptions about any of the enumeration variables. As a side effect, it will also make all the messages consistent and line us up nicely for the error logging strategy (if it ever shows itself again). Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/sd.c')
-rw-r--r--drivers/scsi/sd.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 98da5c8057bf..9de8e186cb69 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1534,8 +1534,8 @@ static int sd_probe(struct device *dev)
1534 if (sdp->type != TYPE_DISK && sdp->type != TYPE_MOD && sdp->type != TYPE_RBC) 1534 if (sdp->type != TYPE_DISK && sdp->type != TYPE_MOD && sdp->type != TYPE_RBC)
1535 goto out; 1535 goto out;
1536 1536
1537 SCSI_LOG_HLQUEUE(3, printk("sd_attach: scsi device: <%d,%d,%d,%d>\n", 1537 SCSI_LOG_HLQUEUE(3, sdev_printk(KERN_INFO, sdp,
1538 sdp->host->host_no, sdp->channel, sdp->id, sdp->lun)); 1538 "sd_attach\n"));
1539 1539
1540 error = -ENOMEM; 1540 error = -ENOMEM;
1541 sdkp = kmalloc(sizeof(*sdkp), GFP_KERNEL); 1541 sdkp = kmalloc(sizeof(*sdkp), GFP_KERNEL);
@@ -1607,10 +1607,8 @@ static int sd_probe(struct device *dev)
1607 dev_set_drvdata(dev, sdkp); 1607 dev_set_drvdata(dev, sdkp);
1608 add_disk(gd); 1608 add_disk(gd);
1609 1609
1610 printk(KERN_NOTICE "Attached scsi %sdisk %s at scsi%d, channel %d, " 1610 sdev_printk(KERN_NOTICE, sdp, "Attached scsi %sdisk %s\n",
1611 "id %d, lun %d\n", sdp->removable ? "removable " : "", 1611 sdp->removable ? "removable " : "", gd->disk_name);
1612 gd->disk_name, sdp->host->host_no, sdp->channel,
1613 sdp->id, sdp->lun);
1614 1612
1615 return 0; 1613 return 0;
1616 1614