Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e04ca907 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Christoph Hellwig
Browse files

fas216: update logging messages 



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

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarRobert Elliott <elliott@hp.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 279c43b3

drivers/scsi/arm/fas216.c

+11 −15
Original line number Diff line number Diff line
@@ -308,8 +308,7 @@ static void fas216_log_command(FAS216_Info *info, int level, 
	fas216_do_log(info, '0' + SCpnt->device->id, fmt, args);

	va_end(args);



	printk(" CDB: ");

	__scsi_print_command(SCpnt->cmnd);

	scsi_print_command(SCpnt);

}



static void
@@ -2079,12 +2078,11 @@ fas216_std_done(FAS216_Info *info, struct scsi_cmnd *SCpnt, unsigned int result) 
			break;



		default:

			printk(KERN_ERR "scsi%d.%c: incomplete data transfer "

				"detected: res=%08X ptr=%p len=%X CDB: ",

				info->host->host_no, '0' + SCpnt->device->id,

			scmd_printk(KERN_ERR, SCpnt,

				    "incomplete data transfer detected: res=%08X ptr=%p len=%X\n",

				    SCpnt->result, info->scsi.SCp.ptr,

				    info->scsi.SCp.this_residual);

			__scsi_print_command(SCpnt->cmnd);

			scsi_print_command(SCpnt);

			set_host_byte(SCpnt, DID_ERROR);

			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.

	 */

	if (info->scsi.SCp.ptr && info->scsi.SCp.this_residual == 0) {

		printk("scsi%d.%c: zero bytes left to transfer, but "

		       "buffer pointer still valid: ptr=%p len=%08x CDB: ",

		       info->host->host_no, '0' + SCpnt->device->id,

		scmd_printk(KERN_INFO, SCpnt,

			    "zero bytes left to transfer, but buffer pointer still valid: ptr=%p len=%08x\n",

			    info->scsi.SCp.ptr, info->scsi.SCp.this_residual);

		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);



	printk("scsi%d.%c: %s: resetting host\n",

		info->host->host_no, '0' + SCpnt->device->id, __func__);

	fas216_log(info, LOG_ERROR, "resetting host");



	/*

	 * Reset the SCSI chip.