Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[sfrench/cifs-2.6.git] / drivers / i2c / busses / i2c-rk3x.c

diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c
index b38b0529946a1ca1c0e463f4a25e5cbbf021f329..f486d0eac4d0202e3933f58a87f0537a587ee5ae 100644 (file)
--- a/drivers/i2c/busses/i2c-rk3x.c
+++ b/drivers/i2c/busses/i2c-rk3x.c
@@ -208,7 +208,7 @@ static void rk3x_i2c_prepare_read(struct rk3x_i2c *i2c)
         * The hw can read up to 32 bytes at a time. If we need more than one
         * chunk, send an ACK after the last byte of the current chunk.
         */
-       if (unlikely(len > 32)) {
+       if (len > 32) {
                len = 32;
                con &= ~REG_CON_LASTACK;
        } else {
@@ -403,7 +403,7 @@ static irqreturn_t rk3x_i2c_irq(int irqno, void *dev_id)
        }
 
        /* is there anything left to handle? */
-       if (unlikely((ipd & REG_INT_ALL) == 0))
+       if ((ipd & REG_INT_ALL) == 0)
                goto out;
 
        switch (i2c->state) {