Skip to contentSkip to conversation

ide: eliminate redundant case in start_request()

PATCH New Jason Lunz 1 participant 1 message Jul 29, 2006

lore
Share & tools
lore

Jason Lunz

author
#0 lore raw

PATCH 1/1 ide: eliminate redundant case in start_request()

Collapse two redundant calls to execute_drive_cmd() in start_request().

Signed-off-by Jason Lunz <[email protected]>

---
I can't think of any reason to separate out the two callsites unless there's some future expansion planned here or something.

 drivers/ide/ide-io.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/ide/ide-io.c +1 -3
Index: linux-2.6.18-rc2-git6/drivers/ide/ide-io.c
===================================================================
@@ -1014,9 +1014,7 @@
 	if (!drive->special.all) {
 		ide_driver_t *drv;
 
-		if (rq->flags & (REQ_DRIVE_CMD | REQ_DRIVE_TASK))
-			return execute_drive_cmd(drive, rq);
-		else if (rq->flags & REQ_DRIVE_TASKFILE)
+		if (rq->flags & (REQ_DRIVE_CMD | REQ_DRIVE_TASK | REQ_DRIVE_TASKFILE))
 			return execute_drive_cmd(drive, rq);
 		else if (blk_pm_request(rq)) {
 			struct request_pm_state *pm = rq->end_io_data;