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>, Andrew Lunn <andrew@lunn.ch>,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Maxime Ripard <maxime.ripard@free-electrons.com>,
GregKH <greg@kroah.com>
Cc: Bartosz Golaszewski <bgolaszewski@baylibre.com>
Subject: [RESEND PATCH 02/14] eeprom: at24: move at24_read() below at24_eeprom_write()
Date: Mon, 6 Jun 2016 10:48:44 +0200 [thread overview]
Message-ID: <1465202936-16832-3-git-send-email-bgolaszewski@baylibre.com> (raw)
In-Reply-To: <1465202936-16832-1-git-send-email-bgolaszewski@baylibre.com>
In preparation for splitting at24_eeprom_write() & at24_eeprom_read()
into smaller, specialized routines move at24_read() below, so that it
won't be intertwined with the low-level EEPROM accessors.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
drivers/misc/eeprom/at24.c | 64 +++++++++++++++++++++++-----------------------
1 file changed, 32 insertions(+), 32 deletions(-)
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 411600d..e12d76f 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -249,38 +249,6 @@ static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf,
return -ETIMEDOUT;
}
-static int at24_read(void *priv, unsigned int off, void *val, size_t count)
-{
- struct at24_data *at24 = priv;
- char *buf = val;
-
- if (unlikely(!count))
- return count;
-
- /*
- * Read data from chip, protecting against concurrent updates
- * from this host, but not from other I2C masters.
- */
- mutex_lock(&at24->lock);
-
- while (count) {
- int status;
-
- status = at24_eeprom_read(at24, buf, off, count);
- if (status < 0) {
- mutex_unlock(&at24->lock);
- return status;
- }
- buf += status;
- off += status;
- count -= status;
- }
-
- mutex_unlock(&at24->lock);
-
- return 0;
-}
-
/*
* Note that if the hardware write-protect pin is pulled high, the whole
* chip is normally write protected. But there are plenty of product
@@ -366,6 +334,38 @@ static ssize_t at24_eeprom_write(struct at24_data *at24, const char *buf,
return -ETIMEDOUT;
}
+static int at24_read(void *priv, unsigned int off, void *val, size_t count)
+{
+ struct at24_data *at24 = priv;
+ char *buf = val;
+
+ if (unlikely(!count))
+ return count;
+
+ /*
+ * Read data from chip, protecting against concurrent updates
+ * from this host, but not from other I2C masters.
+ */
+ mutex_lock(&at24->lock);
+
+ while (count) {
+ int status;
+
+ status = at24_eeprom_read(at24, buf, off, count);
+ if (status < 0) {
+ mutex_unlock(&at24->lock);
+ return status;
+ }
+ buf += status;
+ off += status;
+ count -= status;
+ }
+
+ mutex_unlock(&at24->lock);
+
+ return 0;
+}
+
static int at24_write(void *priv, unsigned int off, void *val, size_t count)
{
struct at24_data *at24 = priv;
--
2.7.4
next prev parent reply other threads:[~2016-06-06 8:57 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-06 8:48 [RESEND PATCH 00/14] eeprom: at24: driver rework and at24cs/at24mac support Bartosz Golaszewski
2016-06-06 8:48 ` [RESEND PATCH 01/14] eeprom: at24: improve the device_id table readability Bartosz Golaszewski
2016-06-06 8:48 ` Bartosz Golaszewski [this message]
2016-06-06 8:48 ` [RESEND PATCH 03/14] eeprom: at24: coding style fixes Bartosz Golaszewski
2016-06-06 8:48 ` [RESEND PATCH 04/14] eeprom: at24: call read/write functions via function pointers Bartosz Golaszewski
2016-06-06 8:48 ` [RESEND PATCH 05/14] eeprom: at24: hide the read/write loop behind a macro Bartosz Golaszewski
2016-07-15 12:24 ` Wolfram Sang
2016-07-15 12:49 ` Bartosz Golaszewski
2016-07-15 15:03 ` Wolfram Sang
2016-07-16 4:56 ` Wolfram Sang
2016-07-16 19:25 ` Bartosz Golaszewski
2016-07-17 18:00 ` Wolfram Sang
2016-06-06 8:48 ` [RESEND PATCH 06/14] eeprom: at24: split at24_eeprom_read() into specialized functions Bartosz Golaszewski
2016-06-06 8:48 ` [RESEND PATCH 07/14] eeprom: at24: split at24_eeprom_write() " Bartosz Golaszewski
2016-06-06 8:48 ` [RESEND PATCH 08/14] eeprom: at24: platform_data: use BIT() macro Bartosz Golaszewski
2016-06-06 8:48 ` [RESEND PATCH 09/14] eeprom: at24: platform_data: add serial number flag Bartosz Golaszewski
2016-06-06 8:48 ` [RESEND PATCH 10/14] eeprom: at24: support reading the serial number Bartosz Golaszewski
2016-06-06 8:48 ` [RESEND PATCH 11/14] eeprom: at24: add the at24cs series to the list of supported devices Bartosz Golaszewski
2016-07-15 6:30 ` Wolfram Sang
2016-07-15 8:54 ` Bartosz Golaszewski
2016-06-06 8:48 ` [RESEND PATCH 12/14] eeprom: at24: platform_data: add at24mac series flag Bartosz Golaszewski
2016-06-06 8:48 ` [RESEND PATCH 13/14] eeprom: at24: add support for at24mac series Bartosz Golaszewski
2016-06-06 8:48 ` [RESEND PATCH 14/14] eeprom: at24: add at24mac chips to the list of supported devices Bartosz Golaszewski
2016-06-06 11:13 ` [RESEND PATCH 00/14] eeprom: at24: driver rework and at24cs/at24mac support Wolfram Sang
2016-06-06 13:01 ` Bartosz Golaszewski
2016-06-08 8:45 ` Wolfram Sang
2016-06-08 9:22 ` Bartosz Golaszewski
2016-07-17 18:02 ` 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=1465202936-16832-3-git-send-email-bgolaszewski@baylibre.com \
--to=bgolaszewski@baylibre.com \
--cc=andrew@lunn.ch \
--cc=greg@kroah.com \
--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).