leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mtip32xx: remove mtip_get_int_command

Browse Source 
Merging this function into the only callers makes the code flow easier.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Christoph Hellwig 2018-11-09 14:49:00 +01:00 committed by Jens Axboe
parent 7bbf118f3b
commit 55c7bc37e0
1 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/block/mtip32xx/mtip32xx.c
View File

@ -168,20 +168,6 @@ static bool mtip_check_surprise_removal(struct pci_dev *pdev)
return false; /* device present */ return false; /* device present */
} }
static struct mtip_cmd *mtip_get_int_command(struct driver_data *dd)
{
struct request *rq;
if (mtip_check_surprise_removal(dd->pdev))
return NULL;
rq = blk_mq_alloc_request(dd->queue, REQ_OP_DRV_IN, BLK_MQ_REQ_RESERVED);
if (IS_ERR(rq))
return NULL;
return blk_mq_rq_to_pdu(rq);
}
static struct mtip_cmd *mtip_cmd_from_tag(struct driver_data *dd, static struct mtip_cmd *mtip_cmd_from_tag(struct driver_data *dd,
unsigned int tag) unsigned int tag)
{ {
@ -1002,12 +988,15 @@ static int mtip_exec_internal_command(struct mtip_port *port,
return -EFAULT; return -EFAULT;
} }
int_cmd = mtip_get_int_command(dd); if (mtip_check_surprise_removal(dd->pdev))
if (!int_cmd) { return -EFAULT;
rq = blk_mq_alloc_request(dd->queue, REQ_OP_DRV_IN, BLK_MQ_REQ_RESERVED);
if (IS_ERR(rq)) {
dbg_printk(MTIP_DRV_NAME "Unable to allocate tag for PIO cmd\n"); dbg_printk(MTIP_DRV_NAME "Unable to allocate tag for PIO cmd\n");
return -EFAULT; return -EFAULT;
} }
rq = blk_mq_rq_from_pdu(int_cmd);
rq->special = &icmd; rq->special = &icmd;
set_bit(MTIP_PF_IC_ACTIVE_BIT, &port->flags); set_bit(MTIP_PF_IC_ACTIVE_BIT, &port->flags);
@ -1029,6 +1018,7 @@ static int mtip_exec_internal_command(struct mtip_port *port,
} }
/* Copy the command to the command table */ /* Copy the command to the command table */
int_cmd = blk_mq_rq_to_pdu(rq);
memcpy(int_cmd->command, fis, fis_len*4); memcpy(int_cmd->command, fis, fis_len*4);
rq->timeout = timeout; rq->timeout = timeout;