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

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

i2c: mux: pca954x: 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>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent a5306b80

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

+4 −23
Original line number Diff line number Diff line
@@ -220,30 +220,11 @@ MODULE_DEVICE_TABLE(of, pca954x_of_match); 
static int pca954x_reg_write(struct i2c_adapter *adap,

			     struct i2c_client *client, u8 val)

{

	int ret = -ENODEV;



	if (adap->algo->master_xfer) {

		struct i2c_msg msg;

		char buf[1];



		msg.addr = client->addr;

		msg.flags = 0;

		msg.len = 1;

		buf[0] = val;

		msg.buf = buf;

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



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

			ret = -EREMOTEIO;

	} else {

		union i2c_smbus_data data;

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

					     client->flags,

					     I2C_SMBUS_WRITE,

					     val, I2C_SMBUS_BYTE, &data);

	}

	union i2c_smbus_data dummy;



	return ret;

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

				I2C_SMBUS_WRITE, val,

				I2C_SMBUS_BYTE, &dummy);

}



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