summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sr.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-24 18:04:06 -0400
committerJames Bottomley <jejb@mulgrave.(none)>2005-10-28 20:52:11 -0500
commit3bf743e7c891d8be8295650b7a6a9b5af083b096 (patch)
treecb44772c2ca37f696300ca197b89e247f83c94d7 /drivers/scsi/sr.c
parent01d7b3b8d09ef78e2c835c03d97ea1d91c26e245 (diff)
downloadlinux-3bf743e7c891d8be8295650b7a6a9b5af083b096.tar.gz
linux-3bf743e7c891d8be8295650b7a6a9b5af083b096.tar.bz2
linux-3bf743e7c891d8be8295650b7a6a9b5af083b096.zip
[SCSI] use {sdev,scmd,starget,shost}_printk in generic code
rejections fixed and Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/sr.c')
-rw-r--r--drivers/scsi/sr.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 3067e5a7b75e..d68cea753bb2 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -360,7 +360,7 @@ static int sr_init_command(struct scsi_cmnd * SCpnt)
}
if (s_size != 512 && s_size != 1024 && s_size != 2048) {
- sdev_printk(KERN_ERR, SCpnt->device, "bad sector size %d\n", s_size);
+ scmd_printk(KERN_ERR, SCpnt, "bad sector size %d\n", s_size);
return 0;
}
@@ -385,9 +385,9 @@ static int sr_init_command(struct scsi_cmnd * SCpnt)
size += sg[i].length;
if (size != SCpnt->request_bufflen && SCpnt->use_sg) {
- sdev_printk(KERN_ERR, SCpnt->device,
- "mismatch count %d, bytes %d\n",
- size, SCpnt->request_bufflen);
+ scmd_printk(KERN_ERR, SCpnt,
+ "mismatch count %d, bytes %d\n",
+ size, SCpnt->request_bufflen);
if (SCpnt->request_bufflen > size)
SCpnt->request_bufflen = SCpnt->bufflen = size;
}
@@ -398,7 +398,7 @@ static int sr_init_command(struct scsi_cmnd * SCpnt)
*/
if (((unsigned int)SCpnt->request->sector % (s_size >> 9)) ||
(SCpnt->request_bufflen % s_size)) {
- sdev_printk(KERN_NOTICE, SCpnt->device, "unaligned transfer\n");
+ scmd_printk(KERN_NOTICE, SCpnt, "unaligned transfer\n");
return 0;
}