linux-i2c.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bartosz Golaszewski <bgolaszewski@baylibre.com>
To: Wolfram Sang <wsa@the-dreams.de>,
	linux-i2c <linux-i2c@vger.kernel.org>,
	LKML <linux-kernel@vger.kernel.org>,
	srinivas.kandagatla@linaro.org, maxime.ripard@free-electrons.com
Cc: Andrew Lunn <andrew@lunn.ch>,
	Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [RESEND PATCH v2 09/13] eeprom: at24: use at24cs_serial_read()
Date: Mon, 11 Apr 2016 11:57:25 -0700	[thread overview]
Message-ID: <1460401049-25459-10-git-send-email-bgolaszewski@baylibre.com> (raw)
In-Reply-To: <1460401049-25459-1-git-send-email-bgolaszewski@baylibre.com>

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

  parent reply	other threads:[~2016-04-11 18:57 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-04-11 18:57 [RESEND PATCH v2 00/13] eeprom: support for at24cs and at24mac Bartosz Golaszewski
2016-04-11 18:57 ` [RESEND PATCH v2 01/13] eeprom: at24: remove a reduntant if Bartosz Golaszewski
2016-04-16 20:48   ` Wolfram Sang
2016-04-11 18:57 ` [RESEND PATCH v2 02/13] eeprom: at24: improve the device_id table readability Bartosz Golaszewski
2016-04-11 18:57 ` [RESEND PATCH v2 03/13] eeprom: at24: platform_data: use BIT() macro Bartosz Golaszewski
2016-04-11 18:57 ` [RESEND PATCH v2 04/13] eeprom: at24: make locking more fine-grained Bartosz Golaszewski
2016-04-16 20:56   ` Wolfram Sang
2016-05-03 17:55     ` Bartosz Golaszewski
2016-04-11 18:57 ` [RESEND PATCH v2 05/13] eeprom: at24: replace msleep() with usleep_range() Bartosz Golaszewski
2016-04-16 20:58   ` Wolfram Sang
2016-04-11 18:57 ` [RESEND PATCH v2 06/13] eeprom: at24: add serial number flag Bartosz Golaszewski
2016-04-11 18:57 ` [RESEND PATCH v2 07/13] eeprom: at24: support reading of the serial number Bartosz Golaszewski
2016-04-11 18:57 ` [RESEND PATCH v2 08/13] eeprom: at24: call read and write routines via function pointers Bartosz Golaszewski
2016-04-11 18:57 ` Bartosz Golaszewski [this message]
2016-04-11 18:57 ` [RESEND PATCH v2 10/13] eeprom: at24: add the at24cs series to the list of supported devices Bartosz Golaszewski
2016-04-11 18:57 ` [RESEND PATCH v2 11/13] eeprom: at24: add at24mac series flag Bartosz Golaszewski
2016-04-11 18:57 ` [RESEND PATCH v2 12/13] eeprom: at24: add support for at24mac series Bartosz Golaszewski
2016-04-11 18:57 ` [RESEND PATCH v2 13/13] eeprom: at24: add at24mac chips to the list of supported devices Bartosz Golaszewski
2016-04-16 21:17 ` [RESEND PATCH v2 00/13] eeprom: support for at24cs and at24mac Wolfram Sang
2016-04-20 14:38   ` Bartosz Golaszewski
2016-05-02  7:42     ` Wolfram Sang

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1460401049-25459-10-git-send-email-bgolaszewski@baylibre.com \
    --to=bgolaszewski@baylibre.com \
    --cc=andrew@lunn.ch \
    --cc=linux-i2c@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maxime.ripard@free-electrons.com \
    --cc=srinivas.kandagatla@linaro.org \
    --cc=wsa@the-dreams.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).