From: Boris Brezillon <bbrezillon@kernel.org>
To: Geert Uytterhoeven <geert+renesas@glider.be>
Cc: Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-mtd@lists.infradead.org,
Nguyen An Hoan <na-hoan@jinso.co.jp>,
linux-kernel@vger.kernel.org, linux-spi@vger.kernel.org
Subject: Re: [PATCH v2 1/2] eeprom: at25: Merge "off" and "offset" in at25_ee_write()
Date: Sat, 26 Jan 2019 11:06:05 +0100 [thread overview]
Message-ID: <20190126110546.360190cc@bbrezillon> (raw)
In-Reply-To: <20190118140525.29189-2-geert+renesas@glider.be>
On Fri, 18 Jan 2019 15:05:24 +0100
Geert Uytterhoeven <geert+renesas@glider.be> wrote:
> Since commit 01973a01f9ec34b7 ("eeprom: at25: remove nvmem regmap
> dependency") changed the type of "off" from "loff_t" to "unsigned int",
> "off" and "offset" are now the same type, and can be merged into a
> single variable.
>
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Boris Brezillon <bbrezillon@kernel.org>
> ---
> v2:
> - Merge "off" and "offset" into a single variable instead of just
> killing the cast, as suggested by Arnd.
> ---
> drivers/misc/eeprom/at25.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/misc/eeprom/at25.c b/drivers/misc/eeprom/at25.c
> index 99de6939cd5ac2e3..2d8e5388e574710d 100644
> --- a/drivers/misc/eeprom/at25.c
> +++ b/drivers/misc/eeprom/at25.c
> @@ -130,7 +130,8 @@ static int at25_ee_read(void *priv, unsigned int offset,
> return status;
> }
>
> -static int at25_ee_write(void *priv, unsigned int off, void *val, size_t count)
> +static int at25_ee_write(void *priv, unsigned int offset, void *val,
> + size_t count)
> {
> struct at25_data *at25 = priv;
> const char *buf = val;
> @@ -138,10 +139,10 @@ static int at25_ee_write(void *priv, unsigned int off, void *val, size_t count)
> unsigned buf_size;
> u8 *bounce;
>
> - if (unlikely(off >= at25->chip.byte_len))
> + if (unlikely(offset >= at25->chip.byte_len))
> return -EFBIG;
> - if ((off + count) > at25->chip.byte_len)
> - count = at25->chip.byte_len - off;
> + if ((offset + count) > at25->chip.byte_len)
> + count = at25->chip.byte_len - offset;
> if (unlikely(!count))
> return -EINVAL;
>
> @@ -160,7 +161,6 @@ static int at25_ee_write(void *priv, unsigned int off, void *val, size_t count)
> do {
> unsigned long timeout, retries;
> unsigned segment;
> - unsigned offset = (unsigned) off;
> u8 *cp = bounce;
> int sr;
> u8 instr;
> @@ -234,7 +234,7 @@ static int at25_ee_write(void *priv, unsigned int off, void *val, size_t count)
> break;
> }
>
> - off += segment;
> + offset += segment;
> buf += segment;
> count -= segment;
>
next prev parent reply other threads:[~2019-01-26 10:06 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-18 14:05 [PATCH v2 0/2] eeprom: at25: SPI transfer improvements Geert Uytterhoeven
2019-01-18 14:05 ` [PATCH v2 1/2] eeprom: at25: Merge "off" and "offset" in at25_ee_write() Geert Uytterhoeven
2019-01-26 10:06 ` Boris Brezillon [this message]
2019-01-18 14:05 ` [PATCH v2 2/2] eeprom: at25: Use spi_message_init_with_transfers() instead of open coding Geert Uytterhoeven
2019-01-26 10:06 ` Boris Brezillon
2019-01-18 22:07 ` [PATCH v2 0/2] eeprom: at25: SPI transfer improvements Boris Brezillon
2019-01-23 18:10 ` Geert Uytterhoeven
2019-01-29 19:02 ` Geert Uytterhoeven
2019-01-30 14:50 ` Greg Kroah-Hartman
2019-01-30 15:08 ` Boris Brezillon
2019-01-30 19:40 ` Greg Kroah-Hartman
2019-01-30 14:55 ` Boris Brezillon
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=20190126110546.360190cc@bbrezillon \
--to=bbrezillon@kernel.org \
--cc=arnd@arndb.de \
--cc=geert+renesas@glider.be \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-spi@vger.kernel.org \
--cc=na-hoan@jinso.co.jp \
/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).