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 05/14] eeprom: at24: hide the read/write loop behind a macro
Date: Mon, 6 Jun 2016 10:48:47 +0200 [thread overview]
Message-ID: <1465202936-16832-6-git-send-email-bgolaszewski@baylibre.com> (raw)
In-Reply-To: <1465202936-16832-1-git-send-email-bgolaszewski@baylibre.com>
Before splitting the read/write routines into smaller, more
specialized functions, unduplicate some code in advance.
Use a 'for' loop instead of 'do while' when waiting for the previous
write to complete and hide it behind a macro.
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
drivers/misc/eeprom/at24.c | 42 ++++++++++++++++++++----------------------
1 file changed, 20 insertions(+), 22 deletions(-)
diff --git a/drivers/misc/eeprom/at24.c b/drivers/misc/eeprom/at24.c
index 0621937..2efb572 100644
--- a/drivers/misc/eeprom/at24.c
+++ b/drivers/misc/eeprom/at24.c
@@ -113,6 +113,22 @@ MODULE_PARM_DESC(write_timeout, "Time (in ms) to try writes (default 25)");
((1 << AT24_SIZE_FLAGS | (_flags)) \
<< AT24_SIZE_BYTELEN | ilog2(_len))
+/*
+ * Both reads and writes fail if the previous write didn't complete yet. This
+ * macro loops a few times waiting at least long enough for one entire page
+ * write to work.
+ *
+ * It takes two parameters: a variable in which the future timeout in jiffies
+ * will be stored and a temporary variable holding the time of the last
+ * iteration of processing the request. Both should be unsigned integers
+ * holding at least 32 bits.
+ */
+#define loop_until_timeout(tout, op_time) \
+ for (tout = jiffies + msecs_to_jiffies(write_timeout), \
+ op_time = jiffies; \
+ time_before(op_time, tout); \
+ usleep_range(1000, 1500), op_time = jiffies)
+
static const struct i2c_device_id at24_ids[] = {
/* needs 8 addresses as A0-A2 are ignored */
{ "24c00", AT24_DEVICE_MAGIC(128 / 8, AT24_FLAG_TAKE8ADDR) },
@@ -225,14 +241,7 @@ static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf,
msg[1].len = count;
}
- /*
- * Reads fail if the previous write didn't complete yet. We may
- * loop a few times until this one succeeds, waiting at least
- * long enough for one entire page write to work.
- */
- timeout = jiffies + msecs_to_jiffies(write_timeout);
- do {
- read_time = jiffies;
+ loop_until_timeout(timeout, read_time) {
if (at24->use_smbus) {
status = i2c_smbus_read_i2c_block_data_or_emulated(client, offset,
count, buf);
@@ -246,9 +255,7 @@ static ssize_t at24_eeprom_read(struct at24_data *at24, char *buf,
if (status == count)
return count;
-
- usleep_range(1000, 1500);
- } while (time_before(read_time, timeout));
+ }
return -ETIMEDOUT;
}
@@ -299,14 +306,7 @@ static ssize_t at24_eeprom_write(struct at24_data *at24, const char *buf,
msg.len = i + count;
}
- /*
- * Writes fail if the previous one didn't complete yet. We may
- * loop a few times until this one succeeds, waiting at least
- * long enough for one entire page write to work.
- */
- timeout = jiffies + msecs_to_jiffies(write_timeout);
- do {
- write_time = jiffies;
+ loop_until_timeout(timeout, write_time) {
if (at24->use_smbus_write) {
switch (at24->use_smbus_write) {
case I2C_SMBUS_I2C_BLOCK_DATA:
@@ -331,9 +331,7 @@ static ssize_t at24_eeprom_write(struct at24_data *at24, const char *buf,
if (status == count)
return count;
-
- usleep_range(1000, 1500);
- } while (time_before(write_time, timeout));
+ }
return -ETIMEDOUT;
}
--
2.7.4
next prev parent reply other threads:[~2016-06-06 8:49 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 ` [RESEND PATCH 02/14] eeprom: at24: move at24_read() below at24_eeprom_write() Bartosz Golaszewski
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 ` Bartosz Golaszewski [this message]
2016-07-15 12:24 ` [RESEND PATCH 05/14] eeprom: at24: hide the read/write loop behind a macro 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-6-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).