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

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

scsi: Remove scsi_print_command when calling abort 



Calling scsi_print_command should not be necessary during abort;
if the information is required one should enable scsi logging.

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 a9a47bf5

drivers/scsi/53c700.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -1906,9 +1906,7 @@ NCR_700_abort(struct scsi_cmnd * SCp) 
{

{

	struct NCR_700_command_slot *slot;

	struct NCR_700_command_slot *slot;





	scmd_printk(KERN_INFO, SCp,

	scmd_printk(KERN_INFO, SCp, "abort command\n");

		"New error handler wants to abort command\n\t");

	scsi_print_command(SCp);





	slot = (struct NCR_700_command_slot *)SCp->host_scribble;

	slot = (struct NCR_700_command_slot *)SCp->host_scribble;

drivers/scsi/NCR5380.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -2667,8 +2667,7 @@ static int NCR5380_abort(Scsi_Cmnd * cmd) { 
	struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;

	struct NCR5380_hostdata *hostdata = (struct NCR5380_hostdata *) instance->hostdata;

	Scsi_Cmnd *tmp, **prev;

	Scsi_Cmnd *tmp, **prev;





	printk(KERN_WARNING "scsi%d : aborting command\n", instance->host_no);

	scmd_printk(KERN_WARNING, cmd, "aborting command\n");

	scsi_print_command(cmd);





	NCR5380_print_status(instance);

	NCR5380_print_status(instance);

drivers/scsi/arm/fas216.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -2423,14 +2423,11 @@ int fas216_eh_abort(struct scsi_cmnd *SCpnt) 




	info->stats.aborts += 1;

	info->stats.aborts += 1;





	printk(KERN_WARNING "scsi%d: abort command ", info->host->host_no);

	scmd_printk(KERN_WARNING, SCpnt, "abort command\n");

	__scsi_print_command(SCpnt->cmnd, SCpnt->cmd_len);





	print_debug_list();

	print_debug_list();

	fas216_dumpstate(info);

	fas216_dumpstate(info);





	printk(KERN_WARNING "scsi%d: abort %p ", info->host->host_no, SCpnt);



	switch (fas216_find_command(info, SCpnt)) {

	switch (fas216_find_command(info, SCpnt)) {

	/*

	/*

	 * We found the command, and cleared it out.  Either

	 * We found the command, and cleared it out.  Either
@@ -2438,7 +2435,7 @@ int fas216_eh_abort(struct scsi_cmnd *SCpnt) 
	 * target, or the busylun bit is not set.

	 * target, or the busylun bit is not set.

	 */

	 */

	case res_success:

	case res_success:

		printk("success\n");

		scmd_printk(KERN_WARNING, SCpnt, "abort %p success\n", SCpnt);

		result = SUCCESS;

		result = SUCCESS;

		break;

		break;
@@ -2449,13 +2446,12 @@ int fas216_eh_abort(struct scsi_cmnd *SCpnt) 
	 */

	 */

	case res_hw_abort:

	case res_hw_abort:







	/*

	/*

	 * We are unable to abort the command for some reason.

	 * We are unable to abort the command for some reason.

	 */

	 */

	default:

	default:

	case res_failed:

	case res_failed:

		printk("failed\n");

		scmd_printk(KERN_WARNING, SCpnt, "abort %p failed\n", SCpnt);

		break;

		break;

	}

	}

drivers/scsi/atari_NCR5380.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -2623,8 +2623,7 @@ int NCR5380_abort(Scsi_Cmnd *cmd) 
	Scsi_Cmnd *tmp, **prev;

	Scsi_Cmnd *tmp, **prev;

	unsigned long flags;

	unsigned long flags;





	printk(KERN_NOTICE "scsi%d: aborting command\n", HOSTNO);

	scmd_printk(KERN_NOTICE, cmd, "aborting command\n");

	scsi_print_command(cmd);





	NCR5380_print_status(instance);

	NCR5380_print_status(instance);

drivers/scsi/ps3rom.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -220,10 +220,6 @@ static int ps3rom_queuecommand_lck(struct scsi_cmnd *cmd, 
	unsigned char opcode;

	unsigned char opcode;

	int res;

	int res;





#ifdef DEBUG

	scsi_print_command(cmd);

#endif



	priv->curr_cmd = cmd;

	priv->curr_cmd = cmd;

	cmd->scsi_done = done;

	cmd->scsi_done = done;