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

Commit bf887378 authored by Stephen M. Cameron's avatar Stephen M. Cameron Committed by Jens Axboe
Browse files

cciss: eliminate unnecessary pointer use in cciss scsi code 



cciss: eliminate unnecessary pointer use in cciss scsi code
An extra level of indirection was being used in some places
for no real reason.

Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
parent aad9fb6f

drivers/block/cciss_scsi.c

+15 −16
Original line number Diff line number Diff line
@@ -1400,7 +1400,7 @@ cciss_scatter_gather(struct pci_dev *pdev, 
static int

cciss_scsi_queue_command (struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd *))

{

	ctlr_info_t **c;

	ctlr_info_t *c;

	int ctlr, rc;

	unsigned char scsi3addr[8];

	CommandList_struct *cp;
@@ -1408,8 +1408,8 @@ cciss_scsi_queue_command (struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd 


	// Get the ptr to our adapter structure (hba[i]) out of cmd->host.

	// We violate cmd->host privacy here.  (Is there another way?)

	c = (ctlr_info_t **) &cmd->device->host->hostdata[0];	

	ctlr = (*c)->ctlr;

	c = (ctlr_info_t *) cmd->device->host->hostdata[0];

	ctlr = c->ctlr;



	rc = lookup_scsi3addr(ctlr, cmd->device->channel, cmd->device->id, 

			cmd->device->lun, scsi3addr);
@@ -1432,7 +1432,7 @@ cciss_scsi_queue_command (struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd 
           see what the device thinks of it. */



	spin_lock_irqsave(CCISS_LOCK(ctlr), flags);

	cp = scsi_cmd_alloc(*c);

	cp = scsi_cmd_alloc(c);

	spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);

	if (cp == NULL) {			/* trouble... */

		printk("scsi_cmd_alloc returned NULL!\n");
@@ -1490,15 +1490,14 @@ cciss_scsi_queue_command (struct scsi_cmnd *cmd, void (* done)(struct scsi_cmnd 
		BUG();

		break;

	}



	cciss_scatter_gather((*c)->pdev, cp, cmd); // Fill the SG list

	cciss_scatter_gather(c->pdev, cp, cmd);



	/* Put the request on the tail of the request queue */



	spin_lock_irqsave(CCISS_LOCK(ctlr), flags);

	addQ(&(*c)->reqQ, cp);

	(*c)->Qdepth++;

	start_io(*c);

	addQ(&c->reqQ, cp);

	c->Qdepth++;

	start_io(c);

	spin_unlock_irqrestore(CCISS_LOCK(ctlr), flags);



	/* the cmd'll come back via intr handler in complete_scsi_command()  */
@@ -1655,14 +1654,14 @@ static int cciss_eh_device_reset_handler(struct scsi_cmnd *scsicmd) 
	int rc;

	CommandList_struct *cmd_in_trouble;

	unsigned char lunaddr[8];

	ctlr_info_t **c;

	ctlr_info_t *c;

	int ctlr;



	/* find the controller to which the command to be aborted was sent */

	c = (ctlr_info_t **) &scsicmd->device->host->hostdata[0];	

	c = (ctlr_info_t *) scsicmd->device->host->hostdata[0];

	if (c == NULL) /* paranoia */

		return FAILED;

	ctlr = (*c)->ctlr;

	ctlr = c->ctlr;

	printk(KERN_WARNING "cciss%d: resetting tape drive or medium changer.\n", ctlr);

	/* find the command that's giving us trouble */

	cmd_in_trouble = (CommandList_struct *) scsicmd->host_scribble;
@@ -1672,7 +1671,7 @@ static int cciss_eh_device_reset_handler(struct scsi_cmnd *scsicmd) 
	/* send a reset to the SCSI LUN which the command was sent to */

	rc = sendcmd_withirq(CCISS_RESET_MSG, ctlr, NULL, 0, 0, lunaddr,

		TYPE_MSG);

	if (rc == 0 && wait_for_device_to_become_ready(*c, lunaddr) == 0)

	if (rc == 0 && wait_for_device_to_become_ready(c, lunaddr) == 0)

		return SUCCESS;

	printk(KERN_WARNING "cciss%d: resetting device failed.\n", ctlr);

	return FAILED;
@@ -1683,14 +1682,14 @@ static int cciss_eh_abort_handler(struct scsi_cmnd *scsicmd) 
	int rc;

	CommandList_struct *cmd_to_abort;

	unsigned char lunaddr[8];

	ctlr_info_t **c;

	ctlr_info_t *c;

	int ctlr;



	/* find the controller to which the command to be aborted was sent */

	c = (ctlr_info_t **) &scsicmd->device->host->hostdata[0];	

	c = (ctlr_info_t *) scsicmd->device->host->hostdata[0];

	if (c == NULL) /* paranoia */

		return FAILED;

	ctlr = (*c)->ctlr;

	ctlr = c->ctlr;

	printk(KERN_WARNING "cciss%d: aborting tardy SCSI cmd\n", ctlr);



	/* find the command to be aborted */