diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-24 18:04:06 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2005-10-28 21:52:11 -0400 |
| commit | 3bf743e7c891d8be8295650b7a6a9b5af083b096 (patch) | |
| tree | cb44772c2ca37f696300ca197b89e247f83c94d7 /drivers/scsi/scsi_lib.c | |
| parent | 01d7b3b8d09ef78e2c835c03d97ea1d91c26e245 (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/scsi_lib.c')
| -rw-r--r-- | drivers/scsi/scsi_lib.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 19ac888001e..e40c8b66da4 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c | |||
| @@ -951,16 +951,14 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes, | |||
| 951 | return; | 951 | return; |
| 952 | } | 952 | } |
| 953 | if (!(req->flags & REQ_QUIET)) | 953 | if (!(req->flags & REQ_QUIET)) |
| 954 | sdev_printk(KERN_INFO, | 954 | scmd_printk(KERN_INFO, cmd, |
| 955 | cmd->device, | 955 | "Device not ready.\n"); |
| 956 | "Device not ready.\n"); | ||
| 957 | scsi_end_request(cmd, 0, this_count, 1); | 956 | scsi_end_request(cmd, 0, this_count, 1); |
| 958 | return; | 957 | return; |
| 959 | case VOLUME_OVERFLOW: | 958 | case VOLUME_OVERFLOW: |
| 960 | if (!(req->flags & REQ_QUIET)) { | 959 | if (!(req->flags & REQ_QUIET)) { |
| 961 | sdev_printk(KERN_INFO, | 960 | scmd_printk(KERN_INFO, cmd, |
| 962 | cmd->device, | 961 | "Volume overflow, CDB: "); |
| 963 | "Volume overflow, CDB: "); | ||
| 964 | __scsi_print_command(cmd->data_cmnd); | 962 | __scsi_print_command(cmd->data_cmnd); |
| 965 | scsi_print_sense("", cmd); | 963 | scsi_print_sense("", cmd); |
| 966 | } | 964 | } |
| @@ -981,9 +979,8 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes, | |||
| 981 | } | 979 | } |
| 982 | if (result) { | 980 | if (result) { |
| 983 | if (!(req->flags & REQ_QUIET)) { | 981 | if (!(req->flags & REQ_QUIET)) { |
| 984 | sdev_printk(KERN_INFO, cmd->device, | 982 | scmd_printk(KERN_INFO, cmd, |
| 985 | "SCSI error: return code = 0x%x\n", | 983 | "SCSI error: return code = 0x%x\n", result); |
| 986 | result); | ||
| 987 | 984 | ||
| 988 | if (driver_byte(result) & DRIVER_SENSE) | 985 | if (driver_byte(result) & DRIVER_SENSE) |
| 989 | scsi_print_sense("", cmd); | 986 | scsi_print_sense("", cmd); |