Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1199885

[PATCH v4 2/8] eeprom: at24: use i2c_smbus_read_i2c_block_data_or_emulated

Show all headers | View raw

For i2c busses that support only SMBUS extensions, the eeprom at24
driver reads data from the device using the SMBus block, word or byte
read protocols depending on availability.

Replace the block read emulation from the driver with the
i2c_smbus_read_i2c_block_data_or_emulated call from i2c core.

Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
---
 drivers/misc/eeprom/at24.c | 37 ++++++-------------------------------
 1 file changed, 6 insertions(+), 31 deletions(-)

diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 6ded3dc..f336f01 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -186,19 +186,11 @@ static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf,
 	if (count > io_limit)
 		count = io_limit;
 
-	switch (at24->use_smbus) {
-	case I2C_SMBUS_I2C_BLOCK_DATA:
+	if (at24->use_smbus) {
 		/* Smaller eeproms can work given some SMBus extension calls */
 		if (count > I2C_SMBUS_BLOCK_MAX)
 			count = I2C_SMBUS_BLOCK_MAX;
-		break;
-	case I2C_SMBUS_WORD_DATA:
-		count = 2;
-		break;
-	case I2C_SMBUS_BYTE_DATA:
-		count = 1;
-		break;
-	default:
+	} else {
 		/*
 		 * When we have a better choice than SMBus calls, use a
 		 * combined I2C message. Write address; then read up to
@@ -229,27 +221,10 @@ static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf,
 	timeout = jiffies + msecs_to_jiffies(write_timeout);
 	do {
 		read_time = jiffies;
-		switch (at24->use_smbus) {
-		case I2C_SMBUS_I2C_BLOCK_DATA:
-			status = i2c_smbus_read_i2c_block_data(client, offset,
-					count, buf);
-			break;
-		case I2C_SMBUS_WORD_DATA:
-			status = i2c_smbus_read_word_data(client, offset);
-			if (status >= 0) {
-				buf[0] = status & 0xff;
-				buf[1] = status >> 8;
-				status = count;
-			}
-			break;
-		case I2C_SMBUS_BYTE_DATA:
-			status = i2c_smbus_read_byte_data(client, offset);
-			if (status >= 0) {
-				buf[0] = status;
-				status = count;
-			}
-			break;
-		default:
+		if (at24->use_smbus) {
+			status = i2c_smbus_read_i2c_block_data_or_emulated(client, offset,
+									   count, buf);
+		} else {
 			status = i2c_transfer(client->adapter, msg, 2);
 			if (status == 2)
 				status = count;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v4 0/8] Add support for best effort block read emulation Irina Tirdea <irina.tirdea@intel.com> - 2015-08-04 16:10 +0200
  [PATCH v4 1/8] i2c: core: Add support for best effort block read emulation Irina Tirdea <irina.tirdea@intel.com> - 2015-08-04 16:10 +0200
    Re: [PATCH v4 1/8] i2c: core: Add support for best effort block read  emulation Jonathan Cameron <jic23@kernel.org> - 2015-08-08 17:30 +0200
    Re: [PATCH v4 1/8] i2c: core: Add support for best effort block read  emulation Wolfram Sang <wsa@the-dreams.de> - 2015-08-09 09:40 +0200
      RE: [PATCH v4 1/8] i2c: core: Add support for best effort block  read emulation "Tirdea, Irina" <irina.tirdea@intel.com> - 2015-08-12 16:10 +0200
        Re: [PATCH v4 1/8] i2c: core: Add support for best effort block read  emulation Wolfram Sang <wsa@the-dreams.de> - 2015-08-12 16:50 +0200
  [PATCH v4 8/8] iio: accel: kxcjk-1013: optimize i2c transfers in trigger handler Irina Tirdea <irina.tirdea@intel.com> - 2015-08-04 16:10 +0200
  [PATCH v4 7/8] iio: accel: kxcjk-1013: use available_scan_masks Irina Tirdea <irina.tirdea@intel.com> - 2015-08-04 16:10 +0200
  [PATCH v4 2/8] eeprom: at24: use i2c_smbus_read_i2c_block_data_or_emulated Irina Tirdea <irina.tirdea@intel.com> - 2015-08-04 16:10 +0200
  [PATCH v4 4/8] iio: accel: bmc150: optimize i2c transfers in trigger handler Irina Tirdea <irina.tirdea@intel.com> - 2015-08-04 16:10 +0200
  [PATCH v4 5/8] iio: gyro: bmg160: use available_scan_masks Irina Tirdea <irina.tirdea@intel.com> - 2015-08-04 16:10 +0200
  [PATCH v4 6/8] iio: gyro: bmg160: optimize i2c transfers in trigger handler Irina Tirdea <irina.tirdea@intel.com> - 2015-08-04 16:10 +0200

csiph-web