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

Commit 3fb364e0 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by James Bottomley
Browse files

[SCSI] sym53c8xx: Use scmd_printk where appropriate 



If we have a scsi_cmnd, it gives the user more information than the
sym_name, and maybe the target.

Signed-off-by: default avatarMatthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 4d85b471

drivers/scsi/sym53c8xx_2/sym_glue.c

+2 −2
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ int sym_setup_data_and_start(struct sym_hcb *np, struct scsi_cmnd *cmd, struct s 
	 */

	switch (dir) {

	case DMA_BIDIRECTIONAL:

		printk("%s: got DMA_BIDIRECTIONAL command", sym_name(np));

		scmd_printk(KERN_INFO, cmd, "got DMA_BIDIRECTIONAL command");

		sym_set_cam_status(cmd, DID_ERROR);

		goto out_abort;

	case DMA_TO_DEVICE:
@@ -606,7 +606,7 @@ static int sym_eh_handler(int op, char *opname, struct scsi_cmnd *cmd) 
	int sts = -1;

	struct completion eh_done;



	dev_warn(&cmd->device->sdev_gendev, "%s operation started.\n", opname);

	scmd_printk(KERN_WARNING, cmd, "%s operation started.\n", opname);



	/* We may be in an error condition because the PCI bus

	 * went down. In this case, we need to wait until the

drivers/scsi/sym53c8xx_2/sym_hipd.c

+17 −18
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
 *  Needed function prototypes.

 */

static void sym_int_ma (struct sym_hcb *np);

static void sym_int_sir (struct sym_hcb *np);

static void sym_int_sir(struct sym_hcb *);

static struct sym_ccb *sym_alloc_ccb(struct sym_hcb *np);

static struct sym_ccb *sym_ccb_from_dsa(struct sym_hcb *np, u32 dsa);

static void sym_alloc_lcb_tags (struct sym_hcb *np, u_char tn, u_char ln);
@@ -1522,7 +1522,8 @@ void sym_put_start_queue(struct sym_hcb *np, struct sym_ccb *cp) 
	np->squeueput = qidx;



	if (DEBUG_FLAGS & DEBUG_QUEUE)

		printf ("%s: queuepos=%d.\n", sym_name (np), np->squeueput);

		scmd_printk(KERN_DEBUG, cp->cmd, "queuepos=%d\n",

							np->squeueput);



	/*

	 *  Script processor may be waiting for reselect.
@@ -4353,31 +4354,30 @@ static void sym_int_sir (struct sym_hcb *np) 
		return;

	/*

	 *  The device didn't go to MSG OUT phase after having 

	 *  been selected with ATN. We donnot want to handle 

	 *  that.

	 *  been selected with ATN.  We do not want to handle that.

	 */

	case SIR_SEL_ATN_NO_MSG_OUT:

		printf ("%s:%d: No MSG OUT phase after selection with ATN.\n",

			sym_name (np), target);

		scmd_printk(KERN_WARNING, cp->cmd,

				"No MSG OUT phase after selection with ATN\n");

		goto out_stuck;

	/*

	 *  The device didn't switch to MSG IN phase after 

	 *  having reseleted the initiator.

	 *  having reselected the initiator.

	 */

	case SIR_RESEL_NO_MSG_IN:

		printf ("%s:%d: No MSG IN phase after reselection.\n",

			sym_name (np), target);

		scmd_printk(KERN_WARNING, cp->cmd,

				"No MSG IN phase after reselection\n");

		goto out_stuck;

	/*

	 *  After reselection, the device sent a message that wasn't 

	 *  an IDENTIFY.

	 */

	case SIR_RESEL_NO_IDENTIFY:

		printf ("%s:%d: No IDENTIFY after reselection.\n",

			sym_name (np), target);

		scmd_printk(KERN_WARNING, cp->cmd,

				"No IDENTIFY after reselection\n");

		goto out_stuck;

	/*

	 *  The device reselected a LUN we donnot know about.

	 *  The device reselected a LUN we do not know about.

	 */

	case SIR_RESEL_BAD_LUN:

		np->msgout[0] = M_RESET;
@@ -4390,8 +4390,7 @@ static void sym_int_sir (struct sym_hcb *np) 
		np->msgout[0] = M_ABORT;

		goto out;

	/*

	 *  The device reselected for a tagged nexus that we donnot 

	 *  have.

	 * The device reselected for a tagged nexus that we do not have.

	 */

	case SIR_RESEL_BAD_I_T_L_Q:

		np->msgout[0] = M_ABORT_TAG;
@@ -4403,8 +4402,8 @@ static void sym_int_sir (struct sym_hcb *np) 
	case SIR_RESEL_ABORTED:

		np->lastmsg = np->msgout[0];

		np->msgout[0] = M_NOOP;

		printf ("%s:%d: message %x sent on bad reselection.\n",

			sym_name (np), target, np->lastmsg);

		scmd_printk(KERN_WARNING, cp->cmd,

			"message %x sent on bad reselection\n", np->lastmsg);

		goto out;

	/*

	 *  The SCRIPTS let us know that a message has been