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

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

i2c: mux: pca9541: 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 d7a0aef2

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

+11 −58
Original line number Diff line number Diff line
@@ -99,33 +99,13 @@ MODULE_DEVICE_TABLE(of, pca9541_of_match); 
static int pca9541_reg_write(struct i2c_client *client, u8 command, u8 val)

{

	struct i2c_adapter *adap = client->adapter;

	int ret;

	union i2c_smbus_data data = { .byte = val };



	if (adap->algo->master_xfer) {

		struct i2c_msg msg;

		char buf[2];



		msg.addr = client->addr;

		msg.flags = 0;

		msg.len = 2;

		buf[0] = command;

		buf[1] = val;

		msg.buf = buf;

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

	} else {

		union i2c_smbus_data data;



		data.byte = val;

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

					     client->flags,

					     I2C_SMBUS_WRITE,

					     command,

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

				I2C_SMBUS_WRITE, command,

				I2C_SMBUS_BYTE_DATA, &data);

}



	return ret;

}



/*

 * Read from chip register. Don't use i2c_transfer()/i2c_smbus_xfer()

 * as they will try to lock adapter a second time.
@@ -133,41 +113,14 @@ static int pca9541_reg_write(struct i2c_client *client, u8 command, u8 val) 
static int pca9541_reg_read(struct i2c_client *client, u8 command)

{

	struct i2c_adapter *adap = client->adapter;

	int ret;

	u8 val;



	if (adap->algo->master_xfer) {

		struct i2c_msg msg[2] = {

			{

				.addr = client->addr,

				.flags = 0,

				.len = 1,

				.buf = &command

			},

			{

				.addr = client->addr,

				.flags = I2C_M_RD,

				.len = 1,

				.buf = &val

			}

		};

		ret = __i2c_transfer(adap, msg, 2);

		if (ret == 2)

			ret = val;

		else if (ret >= 0)

			ret = -EIO;

	} else {

	union i2c_smbus_data data;

	int ret;



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

					     client->flags,

					     I2C_SMBUS_READ,

					     command,

	ret = __i2c_smbus_xfer(adap, client->addr, client->flags,

			       I2C_SMBUS_READ, command,

			       I2C_SMBUS_BYTE_DATA, &data);

		if (!ret)

			ret = data.byte;

	}

	return ret;



	return ret ?: data.byte;

}



/*