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

Commit d7a0aef2 authored by Peter Rosin's avatar Peter Rosin Committed by Wolfram Sang
Browse files

i2c: mux: mlxcpld: make use of __i2c_smbus_xfer 



This simplifies the code, and you get retries for free if the adapter
does not support ->master_xfer.

Signed-off-by: default avatarPeter Rosin <peda@axentia.se>
Acked-by: default avatarMichael Shych <michaelsh@mellanox.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 63453b59

drivers/i2c/muxes/i2c-mux-mlxcpld.c

+4 −24
Original line number Diff line number Diff line
@@ -94,31 +94,11 @@ static int mlxcpld_mux_reg_write(struct i2c_adapter *adap, 
				 struct i2c_client *client, u8 val)

{

	struct mlxcpld_mux_plat_data *pdata = dev_get_platdata(&client->dev);

	int ret = -ENODEV;



	if (adap->algo->master_xfer) {

		struct i2c_msg msg;

		u8 msgbuf[] = {pdata->sel_reg_addr, val};



		msg.addr = client->addr;

		msg.flags = 0;

		msg.len = 2;

		msg.buf = msgbuf;

		ret = __i2c_transfer(adap, &msg, 1);



		if (ret >= 0 && ret != 1)

			ret = -EREMOTEIO;

	} else if (adap->algo->smbus_xfer) {

		union i2c_smbus_data data;



		data.byte = val;

		ret = adap->algo->smbus_xfer(adap, client->addr,

					     client->flags, I2C_SMBUS_WRITE,

					     pdata->sel_reg_addr,

					     I2C_SMBUS_BYTE_DATA, &data);

	}

	union i2c_smbus_data data = { .byte = val };



	return ret;

	return __i2c_smbus_xfer(adap, client->addr, client->flags,

				I2C_SMBUS_WRITE, pdata->sel_reg_addr,

				I2C_SMBUS_BYTE_DATA, &data);

}



static int mlxcpld_mux_select_chan(struct i2c_mux_core *muxc, u32 chan)