Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 485ecdf1 authored by Wolfram Sang's avatar Wolfram Sang
Browse files

i2c: mv64xxx: refactor initialization for new msgs 



We now have a central place to put this code to.

Tested-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent b0200abe

drivers/i2c/busses/i2c-mv64xxx.c

+6 −10
Original line number Diff line number Diff line
@@ -178,11 +178,6 @@ mv64xxx_i2c_prepare_for_io(struct mv64xxx_i2c_data *drv_data, 
{

	u32	dir = 0;



	drv_data->msg = msg;

	drv_data->byte_posn = 0;

	drv_data->bytes_left = msg->len;

	drv_data->aborting = 0;

	drv_data->rc = 0;

	drv_data->cntl_bits = MV64XXX_I2C_REG_CONTROL_ACK |

		MV64XXX_I2C_REG_CONTROL_INTEN | MV64XXX_I2C_REG_CONTROL_TWSIEN;
@@ -208,11 +203,6 @@ static int mv64xxx_i2c_offload_msg(struct mv64xxx_i2c_data *drv_data) 
	if (!drv_data->offload_enabled)

		return -EOPNOTSUPP;



	drv_data->msg = msg;

	drv_data->byte_posn = 0;

	drv_data->bytes_left = msg->len;

	drv_data->aborting = 0;

	drv_data->rc = 0;

	/* Only regular transactions can be offloaded */

	if ((msg->flags & ~(I2C_M_TEN | I2C_M_RD)) != 0)

		return -EINVAL;
@@ -423,6 +413,12 @@ mv64xxx_i2c_fsm(struct mv64xxx_i2c_data *drv_data, u32 status) 


static void mv64xxx_i2c_send_start(struct mv64xxx_i2c_data *drv_data)

{

	drv_data->msg = drv_data->msgs;

	drv_data->byte_posn = 0;

	drv_data->bytes_left = drv_data->msg->len;

	drv_data->aborting = 0;

	drv_data->rc = 0;



	/* Can we offload this msg ? */

	if (mv64xxx_i2c_offload_msg(drv_data) < 0) {

		/* No, switch to standard path */