Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757781AbcCXQV3 (ORCPT ); Thu, 24 Mar 2016 12:21:29 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:37059 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756816AbcCXQT4 (ORCPT ); Thu, 24 Mar 2016 12:19:56 -0400 From: Bartosz Golaszewski To: Wolfram Sang , linux-i2c , LKML Cc: Andrew Lunn , Bartosz Golaszewski Subject: [PATCH v2 09/13] eeprom: at24: use at24cs_serial_read() Date: Thu, 24 Mar 2016 17:19:39 +0100 Message-Id: <1458836383-6668-10-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1458836383-6668-1-git-send-email-bgolaszewski@baylibre.com> References: <1458836383-6668-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1315 Lines: 41 Assign at24cs_serial_read() to at24->read_func if the chip allows serial number read operation. Signed-off-by: Bartosz Golaszewski --- 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