[RESEND PATCH v2 09/13] eeprom: at24: use at24cs_serial_read()

Bartosz Golaszewski
2016-04-11T18:59:33Z

Assign at24cs_serial_read() to at24->read_func if the chip allows serial
number read operation.

Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
drivers/misc/eeprom/at24.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 4c868a2..d3e4d66 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -163,9 +163,8 @@ static struct i2c_client *at24_translate_offset(struct at24_data *at24,
return at24->client[i];
}

-static ssize_t __attribute__((unused))
-at24cs_serial_read(struct at24_data *at24,
- char *buf, loff_t off, size_t count)
+static ssize_t at24cs_serial_read(struct at24_data *at24,
+ char *buf, loff_t off, size_t count)
{
unsigned long timeout, read_time;
struct i2c_client *client;
@@ -615,8 +614,12 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
at24->chip = chip;
at24->num_addresses = num_addresses;

- at24->read_func = at24_read;
- at24->write_func = at24_write;
+ if (chip.flags & AT24_FLAG_SERIAL) {
+ at24->read_func = at24cs_serial_read;
+ } else {
+ at24->read_func = at24_read;
+ at24->write_func = at24_write;
+ }

writable = !(chip.flags & AT24_FLAG_READONLY);
if (writable) {
--
2.7.4