]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
i2c: exynos5: remove extra line and fix an assignment
authorNaveen Krishna Ch <ch.naveen@samsung.com>
Thu, 26 Jun 2014 05:14:58 +0000 (10:44 +0530)
committerWolfram Sang <wsa@the-dreams.de>
Thu, 17 Jul 2014 09:59:21 +0000 (11:59 +0200)
This patch does the following in exynos5_i2c_message_start() function
1. Fixes an assignment
   As, "i2c_auto_conf" is initialized to '0' at the beginning of the
   function and HSI2C_READ_WRITE is defined as (1u << 16)

   Using "|=" for the first assignment is more readable.

2. Removes an extra line

Signed-off-by: Naveen Krishna Chatradhi <ch.naveen@samsung.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
drivers/i2c/busses/i2c-exynos5.c

index 257d7d978986174673caaa4cc77c73093f90d2ba..28073f1d6d47e89693c4ed8b097b4c3368aec635 100644 (file)
@@ -525,7 +525,7 @@ static void exynos5_i2c_message_start(struct exynos5_i2c *i2c, int stop)
        if (i2c->msg->flags & I2C_M_RD) {
                i2c_ctl |= HSI2C_RXCHON;
 
-               i2c_auto_conf = HSI2C_READ_WRITE;
+               i2c_auto_conf |= HSI2C_READ_WRITE;
 
                trig_lvl = (i2c->msg->len > i2c->variant->fifo_depth) ?
                        (i2c->variant->fifo_depth * 3 / 4) : i2c->msg->len;
@@ -548,7 +548,6 @@ static void exynos5_i2c_message_start(struct exynos5_i2c *i2c, int stop)
        writel(fifo_ctl, i2c->regs + HSI2C_FIFO_CTL);
        writel(i2c_ctl, i2c->regs + HSI2C_CTL);
 
-
        /*
         * Enable interrupts before starting the transfer so that we don't
         * miss any INT_I2C interrupts.