Skip to content

Commit

Permalink
mtip32xx: make setting comp_time as common
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Asai Thambi S P authored and Jens Axboe committed Apr 9, 2012
1 parent 4503836 commit dad40f1
Showing 1 changed file with 5 additions and 11 deletions.
16 changes: 5 additions & 11 deletions drivers/block/mtip32xx/mtip32xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,10 @@ static inline void mtip_issue_ncq_command(struct mtip_port *port, int tag)
port->cmd_issue[MTIP_TAG_INDEX(tag)]);

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);
}

/*
Expand Down Expand Up @@ -824,10 +828,6 @@ static void mtip_handle_tfe(struct driver_data *dd)

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. */
mtip_issue_ncq_command(port, tag);

Expand Down Expand Up @@ -2204,9 +2204,7 @@ static void mtip_hw_submit_io(struct driver_data *dd, sector_t start,
/* Issue the command to the hardware */
mtip_issue_ncq_command(port, tag);

/* Set the command's timeout value.*/
port->commands[tag].comp_time = jiffies + msecs_to_jiffies(
MTIP_NCQ_COMMAND_TIMEOUT_MS);
return;
}

/*
Expand Down Expand Up @@ -2538,10 +2536,6 @@ static int mtip_service_thread(void *data)
/* Issue the command to the hardware */
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);
}

Expand Down

0 comments on commit dad40f1

Please sign in to comment.