From: Andrew Morton <akpm@osdl.org>
Date: Fri, 9 Sep 2005 20:02:12 +0000 (-0700)
Subject: [PATCH] deadline: clean up question mark operator
X-Git-Tag: v2.6.14-rc1~447
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9d5c1e1bf2b906966609f8cf4a844e61adb86bcd;p=linux-2.6-omap-h63xx.git

[PATCH] deadline: clean up question mark operator

That ?: trick gives us the creeps.

Cc: Jens Axboe <axboe@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/block/deadline-iosched.c b/drivers/block/deadline-iosched.c
index 24594c57c32..52a3ae5289a 100644
--- a/drivers/block/deadline-iosched.c
+++ b/drivers/block/deadline-iosched.c
@@ -512,7 +512,10 @@ static int deadline_dispatch_requests(struct deadline_data *dd)
 	/*
 	 * batches are currently reads XOR writes
 	 */
-	drq = dd->next_drq[WRITE] ? : dd->next_drq[READ];
+	if (dd->next_drq[WRITE])
+		drq = dd->next_drq[WRITE];
+	else
+		drq = dd->next_drq[READ];
 
 	if (drq) {
 		/* we have a "next request" */