[PATCH] UBI: Replace yield() with cond_resched()

[Richard Weinberger]

The comment above yield()'s definition says:
 * If you want to use yield() to wait for something, use wait_event().
 * If you want to use yield() to be 'nice' for others, use cond_resched().
 * If you still want to use yield(), do not!

The yield() usage of UBI really looks like the "be nice for others" case,
so use cond_resched().

Signed-off-by: Richard Weinberger <richard@xxxxxx>
CC: peterz@xxxxxxxxxxxxx
---
 drivers/mtd/ubi/io.c |    6 +++---
 drivers/mtd/ubi/wl.c |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index 43f1a00..a125ef6 100644
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -192,7 +192,7 @@ retry:
 			dbg_io("error %d%s while reading %d bytes from PEB "
 			       "%d:%d, read only %zd bytes, retry",
 			       err, errstr, len, pnum, offset, read);
-			yield();
+			cond_resched();
 			goto retry;
 		}
 
@@ -366,7 +366,7 @@ retry:
 		if (retries++ < UBI_IO_RETRIES) {
 			dbg_io("error %d while erasing PEB %d, retry",
 			       err, pnum);
-			yield();
+			cond_resched();
 			goto retry;
 		}
 		ubi_err("cannot erase PEB %d, error %d", pnum, err);
@@ -384,7 +384,7 @@ retry:
 	if (ei.state == MTD_ERASE_FAILED) {
 		if (retries++ < UBI_IO_RETRIES) {
 			dbg_io("error while erasing PEB %d, retry", pnum);
-			yield();
+			cond_resched();
 			goto retry;
 		}
 		ubi_err("cannot erase PEB %d", pnum);
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c
index 7c1a9bf..f2f9056 100644
--- a/drivers/mtd/ubi/wl.c
+++ b/drivers/mtd/ubi/wl.c
@@ -1243,7 +1243,7 @@ retry:
 		 */
 		spin_unlock(&ubi->wl_lock);
 		dbg_wl("the PEB %d is not in proper tree, retry", pnum);
-		yield();
+		cond_resched();
 		goto retry;
 	}
 
-- 
1.7.6.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/