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>
This commit is contained in:

committed by
Wolfram Sang

parent
90104d0637
commit
1c176d534f
@@ -312,18 +312,9 @@ scgd_find:
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void rcar_i2c_clock_start(struct rcar_i2c_priv *priv)
|
|
||||||
{
|
|
||||||
rcar_i2c_write(priv, ICCCR, priv->icccr);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* status functions
|
* 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)
|
#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)
|
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 -----------------*/
|
||||||
spin_lock(&priv->lock);
|
spin_lock(&priv->lock);
|
||||||
|
|
||||||
msr = rcar_i2c_status_get(priv);
|
msr = rcar_i2c_read(priv, ICMSR);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Arbitration lost
|
* Arbitration lost
|
||||||
@@ -554,7 +545,8 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap,
|
|||||||
spin_lock_irqsave(&priv->lock, flags);
|
spin_lock_irqsave(&priv->lock, flags);
|
||||||
|
|
||||||
rcar_i2c_init(priv);
|
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_irqrestore(&priv->lock, flags);
|
||||||
/*-------------- spin unlock -----------------*/
|
/*-------------- spin unlock -----------------*/
|
||||||
|
Reference in New Issue
Block a user