diff options
| author | Naveen Krishna Ch <ch.naveen@samsung.com> | 2014-06-26 10:44:58 +0530 |
|---|---|---|
| committer | Wolfram Sang <wsa@the-dreams.de> | 2014-07-17 11:59:21 +0200 |
| commit | 290025d9ffd6ba48b4e18e65e4a9aa668383fbf5 (patch) | |
| tree | 86442c8d335fbf202a25f252261dd55048783293 /drivers/i2c/busses/i2c-exynos5.c | |
| parent | 9f89df3ed6846629c8a30c42a0856f891b5b47d3 (diff) | |
| download | op-kernel-dev-290025d9ffd6ba48b4e18e65e4a9aa668383fbf5.zip op-kernel-dev-290025d9ffd6ba48b4e18e65e4a9aa668383fbf5.tar.gz | |
i2c: exynos5: remove extra line and fix an assignment
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>
Diffstat (limited to 'drivers/i2c/busses/i2c-exynos5.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-exynos5.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c index 257d7d9..28073f1 100644 --- a/drivers/i2c/busses/i2c-exynos5.c +++ b/drivers/i2c/busses/i2c-exynos5.c @@ -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. |
