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

Commit dad40f16 authored by Asai Thambi S P's avatar Asai Thambi S P Committed by Jens Axboe
Browse files

mtip32xx: make setting comp_time as common 



Moved setting completion time into mtip_issue_ncq_command()

Signed-off-by: default avatarAsai Thambi S P <asamymuthupa@micron.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 45038367

drivers/block/mtip32xx/mtip32xx.c

+5 −11
Original line number Diff line number Diff line
@@ -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);

}



/*
@@ -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);
@@ -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;

}



/*
@@ -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);

			}