Commit dd69a9da authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Bartosz Golaszewski
Browse files

eeprom: at24: remove old read functions 



Remove the old and now unused read functions.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
parent 4bb5c13c

drivers/misc/eeprom/at24.c

+0 −186
Original line number Diff line number Diff line
@@ -63,9 +63,6 @@ struct at24_client { 


struct at24_data {

	struct at24_platform_data chip;

	int use_smbus;



	ssize_t (*read_func)(struct at24_data *, char *, unsigned int, size_t);



	/*

	 * Lock protects against activities from other Linux tasks,
@@ -280,39 +277,6 @@ static struct at24_client *at24_translate_offset(struct at24_data *at24, 
	return &at24->client[i];

}



static ssize_t at24_eeprom_read_smbus(struct at24_data *at24, char *buf,

				      unsigned int offset, size_t count)

{

	unsigned long timeout, read_time;

	struct at24_client *at24_client;

	struct i2c_client *client;

	int status;



	at24_client = at24_translate_offset(at24, &offset);

	client = at24_client->client;



	if (count > io_limit)

		count = io_limit;



	/* Smaller eeproms can work given some SMBus extension calls */

	if (count > I2C_SMBUS_BLOCK_MAX)

		count = I2C_SMBUS_BLOCK_MAX;



	loop_until_timeout(timeout, read_time) {

		status = i2c_smbus_read_i2c_block_data_or_emulated(client,

								   offset,

								   count, buf);



		dev_dbg(&client->dev, "read %zu@%d --> %d (%ld)\n",

				count, offset, status, jiffies);



		if (status == count)

			return count;

	}



	return -ETIMEDOUT;

}



static ssize_t at24_regmap_read(struct at24_data *at24, char *buf,

				unsigned int offset, size_t count)

{
@@ -343,146 +307,6 @@ static ssize_t at24_regmap_read(struct at24_data *at24, char *buf, 
	return -ETIMEDOUT;

}



static ssize_t at24_eeprom_read_i2c(struct at24_data *at24, char *buf,

				    unsigned int offset, size_t count)

{

	unsigned long timeout, read_time;

	struct at24_client *at24_client;

	struct i2c_client *client;

	struct i2c_msg msg[2];

	int status, i;

	u8 msgbuf[2];



	memset(msg, 0, sizeof(msg));

	at24_client = at24_translate_offset(at24, &offset);

	client = at24_client->client;



	if (count > io_limit)

		count = io_limit;



	/*

	 * When we have a better choice than SMBus calls, use a combined I2C

	 * message. Write address; then read up to io_limit data bytes. Note

	 * that read page rollover helps us here (unlike writes). msgbuf is

	 * u8 and will cast to our needs.

	 */

	i = 0;

	if (at24->chip.flags & AT24_FLAG_ADDR16)

		msgbuf[i++] = offset >> 8;

	msgbuf[i++] = offset;



	msg[0].addr = client->addr;

	msg[0].buf = msgbuf;

	msg[0].len = i;



	msg[1].addr = client->addr;

	msg[1].flags = I2C_M_RD;

	msg[1].buf = buf;

	msg[1].len = count;



	loop_until_timeout(timeout, read_time) {

		status = i2c_transfer(client->adapter, msg, 2);

		if (status == 2)

			status = count;



		dev_dbg(&client->dev, "read %zu@%d --> %d (%ld)\n",

				count, offset, status, jiffies);



		if (status == count)

			return count;

	}



	return -ETIMEDOUT;

}



static ssize_t at24_eeprom_read_serial(struct at24_data *at24, char *buf,

				       unsigned int offset, size_t count)

{

	unsigned long timeout, read_time;

	struct at24_client *at24_client;

	struct i2c_client *client;

	struct i2c_msg msg[2];

	u8 addrbuf[2];

	int status;



	at24_client = at24_translate_offset(at24, &offset);

	client = at24_client->client;



	memset(msg, 0, sizeof(msg));

	msg[0].addr = client->addr;

	msg[0].buf = addrbuf;



	/*

	 * The address pointer of the device is shared between the regular

	 * EEPROM array and the serial number block. The dummy write (part of

	 * the sequential read protocol) ensures the address pointer is reset

	 * to the desired position.

	 */

	if (at24->chip.flags & AT24_FLAG_ADDR16) {

		/*

		 * For 16 bit address pointers, the word address must contain

		 * a '10' sequence in bits 11 and 10 regardless of the

		 * intended position of the address pointer.

		 */

		addrbuf[0] = 0x08;

		addrbuf[1] = offset;

		msg[0].len = 2;

	} else {

		/*

		 * Otherwise the word address must begin with a '10' sequence,

		 * regardless of the intended address.

		 */

		addrbuf[0] = 0x80 + offset;

		msg[0].len = 1;

	}



	msg[1].addr = client->addr;

	msg[1].flags = I2C_M_RD;

	msg[1].buf = buf;

	msg[1].len = count;



	loop_until_timeout(timeout, read_time) {

		status = i2c_transfer(client->adapter, msg, 2);

		if (status == 2)

			return count;

	}



	return -ETIMEDOUT;

}



static ssize_t at24_eeprom_read_mac(struct at24_data *at24, char *buf,

				    unsigned int offset, size_t count)

{

	unsigned long timeout, read_time;

	struct at24_client *at24_client;

	struct i2c_client *client;

	struct i2c_msg msg[2];

	u8 addrbuf[2];

	int status;



	at24_client = at24_translate_offset(at24, &offset);

	client = at24_client->client;



	memset(msg, 0, sizeof(msg));

	msg[0].addr = client->addr;

	msg[0].buf = addrbuf;

	/* EUI-48 starts from 0x9a, EUI-64 from 0x98 */

	addrbuf[0] = 0xa0 - at24->chip.byte_len + offset;

	msg[0].len = 1;

	msg[1].addr = client->addr;

	msg[1].flags = I2C_M_RD;

	msg[1].buf = buf;

	msg[1].len = count;



	loop_until_timeout(timeout, read_time) {

		status = i2c_transfer(client->adapter, msg, 2);

		if (status == 2)

			return count;

	}



	return -ETIMEDOUT;

}



/*

 * Note that if the hardware write-protect pin is pulled high, the whole

 * chip is normally write protected. But there are plenty of product
@@ -797,7 +621,6 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) 
		return -ENOMEM;



	mutex_init(&at24->lock);

	at24->use_smbus = use_smbus;

	at24->chip = chip;

	at24->num_addresses = num_addresses;

	at24->offset_adj = at24_get_offset_adj(chip.flags, chip.byte_len);
@@ -813,15 +636,6 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) 
		return -EINVAL;

	}



	if (chip.flags & AT24_FLAG_SERIAL) {

		at24->read_func = at24_eeprom_read_serial;

	} else if (chip.flags & AT24_FLAG_MAC) {

		at24->read_func = at24_eeprom_read_mac;

	} else {

		at24->read_func = at24->use_smbus ? at24_eeprom_read_smbus

						  : at24_eeprom_read_i2c;

	}



	writable = !(chip.flags & AT24_FLAG_READONLY);

	if (writable) {

		if (!use_smbus || use_smbus_write) {