| From 3771444f2e34a54f0e0553f354cde2c577a34802 Mon Sep 17 00:00:00 2001 |
| From: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Date: Wed, 28 May 2014 09:44:36 +0200 |
| Subject: i2c: rcar: not everything needs to be a function |
| |
| Very basic operations, just called once, can also go to the caller. |
| |
| Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> |
| Signed-off-by: Wolfram Sang <wsa@the-dreams.de> |
| (cherry picked from commit 1c176d534f81c350f67dd4dc6d0330a45c11c9a6) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/i2c/busses/i2c-rcar.c | 14 +++----------- |
| 1 file changed, 3 insertions(+), 11 deletions(-) |
| |
| diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c |
| index 467eafa050a6..de4e6b81fa9b 100644 |
| --- a/drivers/i2c/busses/i2c-rcar.c |
| +++ b/drivers/i2c/busses/i2c-rcar.c |
| @@ -312,18 +312,9 @@ scgd_find: |
| return 0; |
| } |
| |
| -static void rcar_i2c_clock_start(struct rcar_i2c_priv *priv) |
| -{ |
| - rcar_i2c_write(priv, ICCCR, priv->icccr); |
| -} |
| - |
| /* |
| * status functions |
| */ |
| -static u32 rcar_i2c_status_get(struct rcar_i2c_priv *priv) |
| -{ |
| - return rcar_i2c_read(priv, ICMSR); |
| -} |
| |
| #define rcar_i2c_status_clear(priv) rcar_i2c_status_bit_clear(priv, 0xffffffff) |
| static void rcar_i2c_status_bit_clear(struct rcar_i2c_priv *priv, u32 bit) |
| @@ -480,7 +471,7 @@ static irqreturn_t rcar_i2c_irq(int irq, void *ptr) |
| /*-------------- spin lock -----------------*/ |
| spin_lock(&priv->lock); |
| |
| - msr = rcar_i2c_status_get(priv); |
| + msr = rcar_i2c_read(priv, ICMSR); |
| |
| /* |
| * Arbitration lost |
| @@ -554,7 +545,8 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, |
| spin_lock_irqsave(&priv->lock, flags); |
| |
| rcar_i2c_init(priv); |
| - rcar_i2c_clock_start(priv); |
| + /* start clock */ |
| + rcar_i2c_write(priv, ICCCR, priv->icccr); |
| |
| spin_unlock_irqrestore(&priv->lock, flags); |
| /*-------------- spin unlock -----------------*/ |
| -- |
| 2.1.2 |
| |
