Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mtip32xx: make setting comp_time as common

Browse source 
Moved setting completion time into mtip_issue_ncq_command()

Signed-off-by: Asai Thambi S P <asamymuthupa@micron.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Asai Thambi S P 2012-04-09 08:35:38 +02:00 committed by Jens Axboe
parent 45038367c2
commit dad40f16ff
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/block/mtip32xx/mtip32xx.c
View file

@ -306,6 +306,10 @@ static inline void mtip_issue_ncq_command(struct mtip_port *port, int tag)
port->cmd_issue[MTIP_TAG_INDEX(tag)]); port->cmd_issue[MTIP_TAG_INDEX(tag)]);
spin_unlock_irqrestore(&port->cmd_issue_lock, flags); spin_unlock_irqrestore(&port->cmd_issue_lock, flags);
/* Set the command's timeout value.*/
port->commands[tag].comp_time = jiffies + msecs_to_jiffies(
MTIP_NCQ_COMMAND_TIMEOUT_MS);
} }
/* /*
@ -824,10 +828,6 @@ static void mtip_handle_tfe(struct driver_data *dd)
set_bit(tag, tagaccum); set_bit(tag, tagaccum);
/* Update the timeout value. */
port->commands[tag].comp_time =
jiffies + msecs_to_jiffies(
MTIP_NCQ_COMMAND_TIMEOUT_MS);
/* Re-issue the command. */ /* Re-issue the command. */
mtip_issue_ncq_command(port, tag); mtip_issue_ncq_command(port, tag);
@ -2204,9 +2204,7 @@ static void mtip_hw_submit_io(struct driver_data *dd, sector_t start,
/* Issue the command to the hardware */ /* Issue the command to the hardware */
mtip_issue_ncq_command(port, tag); mtip_issue_ncq_command(port, tag);
/* Set the command's timeout value.*/ return;
port->commands[tag].comp_time = jiffies + msecs_to_jiffies(
MTIP_NCQ_COMMAND_TIMEOUT_MS);
} }
/* /*
@ -2538,10 +2536,6 @@ static int mtip_service_thread(void *data)
/* Issue the command to the hardware */ /* Issue the command to the hardware */
mtip_issue_ncq_command(port, slot); mtip_issue_ncq_command(port, slot);
/* Set the command's timeout value.*/
port->commands[slot].comp_time = jiffies +
msecs_to_jiffies(MTIP_NCQ_COMMAND_TIMEOUT_MS);
clear_bit(slot, port->cmds_to_issue); clear_bit(slot, port->cmds_to_issue);
} }