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/sg.c | |
| parent | a2c78f7c1d393d89240ed5922d3aa8e439aec82e (diff) | |
| parent | 39b7f1e25a412b0ef31e516cfc2fa4f40235f263 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/sg.c')
| -rw-r--r-- | drivers/scsi/sg.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index d86d5c26061..4f30a37db63 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c @@ -1498,10 +1498,9 @@ static int sg_alloc(struct gendisk *disk, struct scsi_device *scsidp) overflow: write_unlock_irqrestore(&sg_dev_arr_lock, iflags); - printk(KERN_WARNING - "Unable to attach sg device <%d, %d, %d, %d> type=%d, minor " - "number exceeds %d\n", scsidp->host->host_no, scsidp->channel, - scsidp->id, scsidp->lun, scsidp->type, SG_MAX_DEVS - 1); + sdev_printk(KERN_WARNING, scsidp, + "Unable to attach sg device type=%d, minor " + "number exceeds %d\n", scsidp->type, SG_MAX_DEVS - 1); error = -ENODEV; goto out; } @@ -1567,11 +1566,8 @@ sg_add(struct class_device *cl_dev, struct class_interface *cl_intf) } else printk(KERN_WARNING "sg_add: sg_sys INvalid\n"); - printk(KERN_NOTICE - "Attached scsi generic sg%d at scsi%d, channel" - " %d, id %d, lun %d, type %d\n", k, - scsidp->host->host_no, scsidp->channel, scsidp->id, - scsidp->lun, scsidp->type); + sdev_printk(KERN_NOTICE, scsidp, + "Attached scsi generic sg%d type %d\n", k,scsidp->type); return 0; |