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

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

cciss: remove some superfluous tests from cciss_bigpassthru() 



Signed-off-by: default avatarStephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 0c9f5ba7

drivers/block/cciss.c

+8 −17
Original line number Original line Diff line number Diff line
@@ -1580,29 +1580,20 @@ static int cciss_bigpassthru(ctlr_info_t *h, void __user *argp) 
	}

	}

	c->cmd_type = CMD_IOCTL_PEND;

	c->cmd_type = CMD_IOCTL_PEND;

	c->Header.ReplyQueue = 0;

	c->Header.ReplyQueue = 0;



	if (ioc->buf_size > 0) {

	c->Header.SGList = sg_used;

	c->Header.SGList = sg_used;

	c->Header.SGTotal = sg_used;

	c->Header.SGTotal = sg_used;

	} else {

		c->Header.SGList = 0;

		c->Header.SGTotal = 0;

	}

	c->Header.LUN = ioc->LUN_info;

	c->Header.LUN = ioc->LUN_info;

	c->Header.Tag.lower = c->busaddr;

	c->Header.Tag.lower = c->busaddr;





	c->Request = ioc->Request;

	c->Request = ioc->Request;

	if (ioc->buf_size > 0) {

	for (i = 0; i < sg_used; i++) {

	for (i = 0; i < sg_used; i++) {

			temp64.val =

		temp64.val = pci_map_single(h->pdev, buff[i], buff_size[i],

			    pci_map_single(h->pdev, buff[i], buff_size[i],

				    PCI_DMA_BIDIRECTIONAL);

				    PCI_DMA_BIDIRECTIONAL);

		c->SG[i].Addr.lower = temp64.val32.lower;

		c->SG[i].Addr.lower = temp64.val32.lower;

		c->SG[i].Addr.upper = temp64.val32.upper;

		c->SG[i].Addr.upper = temp64.val32.upper;

		c->SG[i].Len = buff_size[i];

		c->SG[i].Len = buff_size[i];

		c->SG[i].Ext = 0;	/* we are not chaining */

		c->SG[i].Ext = 0;	/* we are not chaining */

	}

	}

	}

	c->waiting = &wait;

	c->waiting = &wait;

	enqueue_cmd_and_start_io(h, c);

	enqueue_cmd_and_start_io(h, c);

	wait_for_completion(&wait);

	wait_for_completion(&wait);