From: Roel Kluin <12o3l@tiscali.nl>
Date: Sat, 16 Feb 2008 17:14:35 +0000 (+0100)
Subject: [MTD] [OneNAND] unlikely(x) || unlikely(y) => unlikely(x || y)
X-Git-Tag: v2.6.26-rc1~1069^2~40
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=b73d7e4381311bea024bf7cedcba3dcf20f63aab;p=linux-2.6-omap-h63xx.git

[MTD] [OneNAND] unlikely(x) || unlikely(y) => unlikely(x || y)

Acked-By: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
---

diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index 15a62db656d..56255c85d97 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -1336,7 +1336,7 @@ static int onenand_panic_write(struct mtd_info *mtd, loff_t to, size_t len,
 	}
 
 	/* Reject writes, which are not page aligned */
-        if (unlikely(NOTALIGNED(to)) || unlikely(NOTALIGNED(len))) {
+        if (unlikely(NOTALIGNED(to) || NOTALIGNED(len))) {
                 printk(KERN_ERR "onenand_panic_write: Attempt to write not page aligned data\n");
                 return -EINVAL;
         }
@@ -1466,7 +1466,7 @@ static int onenand_write_ops_nolock(struct mtd_info *mtd, loff_t to,
 	}
 
 	/* Reject writes, which are not page aligned */
-        if (unlikely(NOTALIGNED(to)) || unlikely(NOTALIGNED(len))) {
+        if (unlikely(NOTALIGNED(to) || NOTALIGNED(len))) {
                 printk(KERN_ERR "onenand_write_ops_nolock: Attempt to write not page aligned data\n");
                 return -EINVAL;
         }