GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fas216: update logging messages

Browse source 
Update logging messages to use dev_printk() variants for correct
device annotations.

Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Robert Elliott <elliott@hp.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Hannes Reinecke 2014-10-24 14:26:48 +02:00 • committed by Christoph Hellwig
parent 279c43b30b
commit e04ca9078e
1 changed files with 11 additions and 15 deletions

20
drivers/scsi/arm/fas216.c
View file

@ -308,8 +308,7 @@ static void fas216_log_command(FAS216_Info *info, int level,
fas216_do_log(info, '0' + SCpnt->device->id, fmt, args); fas216_do_log(info, '0' + SCpnt->device->id, fmt, args);
va_end(args); va_end(args);
printk(" CDB: "); scsi_print_command(SCpnt);
__scsi_print_command(SCpnt->cmnd);
} }
static void static void
@ -2079,12 +2078,11 @@ fas216_std_done(FAS216_Info *info, struct scsi_cmnd *SCpnt, unsigned int result)
break; break;
default: default:
printk(KERN_ERR "scsi%d.%c: incomplete data transfer " scmd_printk(KERN_ERR, SCpnt,
"detected: res=%08X ptr=%p len=%X CDB: ", "incomplete data transfer detected: res=%08X ptr=%p len=%X\n",
info->host->host_no, '0' + SCpnt->device->id,
SCpnt->result, info->scsi.SCp.ptr, SCpnt->result, info->scsi.SCp.ptr,
info->scsi.SCp.this_residual); info->scsi.SCp.this_residual);
__scsi_print_command(SCpnt->cmnd); scsi_print_command(SCpnt);
set_host_byte(SCpnt, DID_ERROR); set_host_byte(SCpnt, DID_ERROR);
goto request_sense; goto request_sense;
} }
@ -2157,12 +2155,11 @@ static void fas216_done(FAS216_Info *info, unsigned int result)
* to transfer, we should not have a valid pointer. * to transfer, we should not have a valid pointer.
*/ */
if (info->scsi.SCp.ptr && info->scsi.SCp.this_residual == 0) { if (info->scsi.SCp.ptr && info->scsi.SCp.this_residual == 0) {
printk("scsi%d.%c: zero bytes left to transfer, but " scmd_printk(KERN_INFO, SCpnt,
"buffer pointer still valid: ptr=%p len=%08x CDB: ", "zero bytes left to transfer, but buffer pointer still valid: ptr=%p len=%08x\n",
info->host->host_no, '0' + SCpnt->device->id,
info->scsi.SCp.ptr, info->scsi.SCp.this_residual); info->scsi.SCp.ptr, info->scsi.SCp.this_residual);
info->scsi.SCp.ptr = NULL; info->scsi.SCp.ptr = NULL;
__scsi_print_command(SCpnt->cmnd); scsi_print_command(SCpnt);
} }
/* /*
@ -2663,8 +2660,7 @@ int fas216_eh_host_reset(struct scsi_cmnd *SCpnt)
fas216_checkmagic(info); fas216_checkmagic(info);
printk("scsi%d.%c: %s: resetting host\n", fas216_log(info, LOG_ERROR, "resetting host");
info->host->host_no, '0' + SCpnt->device->id, __func__);
/* /*
* Reset the SCSI chip. * Reset the SCSI chip.