diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-05 10:31:35 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-05 10:31:35 -0800 |
commit | fecb4a0c87c2bcaee1f3cf800126eef752a07ed3 (patch) | |
tree | 32fbc17daf7879a9a86eb029096994be45cd136b /drivers/scsi/st.c | |
parent | a2c78f7c1d393d89240ed5922d3aa8e439aec82e (diff) | |
parent | 39b7f1e25a412b0ef31e516cfc2fa4f40235f263 (diff) | |
download | kernel_samsung_smdk4412-fecb4a0c87c2bcaee1f3cf800126eef752a07ed3.tar.gz kernel_samsung_smdk4412-fecb4a0c87c2bcaee1f3cf800126eef752a07ed3.tar.bz2 kernel_samsung_smdk4412-fecb4a0c87c2bcaee1f3cf800126eef752a07ed3.zip |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/st.c')
-rw-r--r-- | drivers/scsi/st.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index da9766283bd..6b85f84c839 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c @@ -3887,9 +3887,7 @@ static int st_probe(struct device *dev) if (SDp->type != TYPE_TAPE) return -ENODEV; if ((stp = st_incompatible(SDp))) { - printk(KERN_INFO - "st: Found incompatible tape at scsi%d, channel %d, id %d, lun %d\n", - SDp->host->host_no, SDp->channel, SDp->id, SDp->lun); + sdev_printk(KERN_INFO, SDp, "Found incompatible tape\n"); printk(KERN_INFO "st: The suggested driver is %s.\n", stp); return -ENODEV; } @@ -4077,9 +4075,8 @@ static int st_probe(struct device *dev) } disk->number = devfs_register_tape(SDp->devfs_name); - printk(KERN_WARNING - "Attached scsi tape %s at scsi%d, channel %d, id %d, lun %d\n", - tape_name(tpnt), SDp->host->host_no, SDp->channel, SDp->id, SDp->lun); + sdev_printk(KERN_WARNING, SDp, + "Attached scsi tape %s", tape_name(tpnt)); printk(KERN_WARNING "%s: try direct i/o: %s (alignment %d B), max page reachable by HBA %lu\n", tape_name(tpnt), tpnt->try_dio ? "yes" : "no", queue_dma_alignment(SDp->request_queue) + 1, tpnt->max_pfn); |