aboutsummaryrefslogtreecommitdiffstats
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 21:52:11 -0400
commit3bf743e7c891d8be8295650b7a6a9b5af083b096 (patch)
treecb44772c2ca37f696300ca197b89e247f83c94d7 /drivers/scsi/sr.c
parent01d7b3b8d09ef78e2c835c03d97ea1d91c26e245 (diff)
[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)
360 } 360 }
361 361
362 if (s_size != 512 && s_size != 1024 && s_size != 2048) { 362 if (s_size != 512 && s_size != 1024 && s_size != 2048) {
363 sdev_printk(KERN_ERR, SCpnt->device, "bad sector size %d\n", s_size); 363 scmd_printk(KERN_ERR, SCpnt, "bad sector size %d\n", s_size);
364 return 0; 364 return 0;
365 } 365 }
366 366
@@ -385,9 +385,9 @@ static int sr_init_command(struct scsi_cmnd * SCpnt)
385 size += sg[i].length; 385 size += sg[i].length;
386 386
387 if (size != SCpnt->request_bufflen && SCpnt->use_sg) { 387 if (size != SCpnt->request_bufflen && SCpnt->use_sg) {
388 sdev_printk(KERN_ERR, SCpnt->device, 388 scmd_printk(KERN_ERR, SCpnt,
389 "mismatch count %d, bytes %d\n", 389 "mismatch count %d, bytes %d\n",
390 size, SCpnt->request_bufflen); 390 size, SCpnt->request_bufflen);
391 if (SCpnt->request_bufflen > size) 391 if (SCpnt->request_bufflen > size)
392 SCpnt->request_bufflen = SCpnt->bufflen = size; 392 SCpnt->request_bufflen = SCpnt->bufflen = size;
393 } 393 }
@@ -398,7 +398,7 @@ static int sr_init_command(struct scsi_cmnd * SCpnt)
398 */ 398 */
399 if (((unsigned int)SCpnt->request->sector % (s_size >> 9)) || 399 if (((unsigned int)SCpnt->request->sector % (s_size >> 9)) ||
400 (SCpnt->request_bufflen % s_size)) { 400 (SCpnt->request_bufflen % s_size)) {
401 sdev_printk(KERN_NOTICE, SCpnt->device, "unaligned transfer\n"); 401 scmd_printk(KERN_NOTICE, SCpnt, "unaligned transfer\n");
402 return 0; 402 return 0;
403 } 403 }
404 404