Commit 7c7117ff authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Wolfram Sang
Browse files

i2c: rcar: make rcar_i2c_prepare_msg() *void* 



rcar_i2c_prepare_msg() always returns 0, so we can make this function return
*void* and thus remove the result check in rcar_i2c_master_xfer().

Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent c30d7662

drivers/i2c/busses/i2c-rcar.c

+2 −7
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static int rcar_i2c_clock_calculate(struct rcar_i2c_priv *priv, 
	return 0;

}



static int rcar_i2c_prepare_msg(struct rcar_i2c_priv *priv)

static void rcar_i2c_prepare_msg(struct rcar_i2c_priv *priv)

{

	int read = !!rcar_i2c_is_recv(priv);
@@ -253,8 +253,6 @@ static int rcar_i2c_prepare_msg(struct rcar_i2c_priv *priv) 
	rcar_i2c_write(priv, ICMSR, 0);

	rcar_i2c_write(priv, ICMCR, RCAR_BUS_PHASE_START);

	rcar_i2c_write(priv, ICMIER, read ? RCAR_IRQ_RECV : RCAR_IRQ_SEND);



	return 0;

}



/*
@@ -456,14 +454,11 @@ static int rcar_i2c_master_xfer(struct i2c_adapter *adap, 
		if (i == num - 1)

			rcar_i2c_flags_set(priv, ID_LAST_MSG);



		ret = rcar_i2c_prepare_msg(priv);

		rcar_i2c_prepare_msg(priv);



		spin_unlock_irqrestore(&priv->lock, flags);

		/*-------------- spin unlock -----------------*/



		if (ret < 0)

			break;



		timeout = wait_event_timeout(priv->wait,

					     rcar_i2c_flags_has(priv, ID_DONE),

					     5 * HZ);