Commit 30dac746 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

[PATCH] i2c: Drop I2C_SMBUS_I2C_BLOCK_MAX 



Drop I2C_SMBUS_I2C_BLOCK_MAX, use I2C_SMBUS_BLOCK_MAX instead.

I2C_SMBUS_I2C_BLOCK_MAX has always been defined to the same value as
I2C_SMBUS_BLOCK_MAX, and this will never change: setting it to a lower
value would make no sense, setting it to a higher value would break
i2c_smbus_data compatibility. There is no point in changing
i2c_smbus_data to support larger block transactions in SMBus mode, as
no SMBus hardware supports more than 32 byte blocks. Thus, for larger
transactions, direct I2C transfers are the way to go.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d3554b4a

drivers/i2c/chips/eeprom.c

+2 −2
Original line number Diff line number Diff line
@@ -88,8 +88,8 @@ static void eeprom_update_client(struct i2c_client *client, u8 slice) 
		dev_dbg(&client->dev, "Starting eeprom update, slice %u\n", slice);



		if (i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {

			for (i = slice << 5; i < (slice + 1) << 5; i += I2C_SMBUS_I2C_BLOCK_MAX)

				if (i2c_smbus_read_i2c_block_data(client, i, data->data + i) != I2C_SMBUS_I2C_BLOCK_MAX)

			for (i = slice << 5; i < (slice + 1) << 5; i += I2C_SMBUS_BLOCK_MAX)

				if (i2c_smbus_read_i2c_block_data(client, i, data->data + i) != I2C_SMBUS_BLOCK_MAX)

					goto exit;

		} else {

			if (i2c_smbus_write_byte(client, slice << 5)) {

drivers/i2c/i2c-core.c

+4 −4
Original line number Diff line number Diff line
@@ -1108,10 +1108,10 @@ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter * adapter, u16 addr, 
		return -1;

	case I2C_SMBUS_I2C_BLOCK_DATA:

		if (read_write == I2C_SMBUS_READ) {

			msg[1].len = I2C_SMBUS_I2C_BLOCK_MAX;

			msg[1].len = I2C_SMBUS_BLOCK_MAX;

		} else {

			msg[0].len = data->block[0] + 1;

			if (msg[0].len > I2C_SMBUS_I2C_BLOCK_MAX + 1) {

			if (msg[0].len > I2C_SMBUS_BLOCK_MAX + 1) {

				dev_err(&adapter->dev, "i2c_smbus_xfer_emulated called with "

				       "invalid block write size (%d)\n",

				       data->block[0]);
@@ -1144,8 +1144,8 @@ static s32 i2c_smbus_xfer_emulated(struct i2c_adapter * adapter, u16 addr, 
				break;

			case I2C_SMBUS_I2C_BLOCK_DATA:

				/* fixed at 32 for now */

				data->block[0] = I2C_SMBUS_I2C_BLOCK_MAX;

				for (i = 0; i < I2C_SMBUS_I2C_BLOCK_MAX; i++)

				data->block[0] = I2C_SMBUS_BLOCK_MAX;

				for (i = 0; i < I2C_SMBUS_BLOCK_MAX; i++)

					data->block[i+1] = msgbuf1[i];

				break;

		}

include/linux/i2c.h

+0 −1
Original line number Diff line number Diff line
@@ -448,7 +448,6 @@ struct i2c_msg { 
 * Data for SMBus Messages 

 */

#define I2C_SMBUS_BLOCK_MAX	32	/* As specified in SMBus standard */	

#define I2C_SMBUS_I2C_BLOCK_MAX	32	/* Not specified but we use same structure */

union i2c_smbus_data {

	__u8 byte;

	__u16 word;

CRA Git | Maintained and supported by SUSTech CRA and CCSE