From: hkallweit1@gmail.com (Heiner Kallweit)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH 08/12] i2c: meson: explicitly ignore messages with length zero
Date: Wed, 8 Mar 2017 23:03:46 +0100 [thread overview]
Message-ID: <00a0854d-b0f6-5711-0b6e-25f0f3fe9b4f@gmail.com> (raw)
In-Reply-To: <CANe6Qb9nKdLnOcwEwuk8NXEB+fxW2S_kkzP+U+qygYhNqz0Y0w@mail.gmail.com>
Am 08.03.2017 um 08:53 schrieb Ben Dooks:
> Probably a bad idea. Zero data could just be an address is there check
>
Thanks for pointing out.
> On 8 Mar 2017 06:51, "Heiner Kallweit" <hkallweit1 at gmail.com <mailto:hkallweit1@gmail.com>> wrote:
>
> Explicitely ignore messages with length zero. This also allows to
> remove some now unneeded checks during message processing.
>
> Signed-off-by: Heiner Kallweit <hkallweit1 at gmail.com <mailto:hkallweit1@gmail.com>>
> ---
> drivers/i2c/busses/i2c-meson.c | 20 +++++++++-----------
> 1 file changed, 9 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-meson.c b/drivers/i2c/busses/i2c-meson.c
> index b3b881f9..58414699 100644
> --- a/drivers/i2c/busses/i2c-meson.c
> +++ b/drivers/i2c/busses/i2c-meson.c
> @@ -196,12 +196,10 @@ static void meson_i2c_prepare_xfer(struct meson_i2c *i2c)
> for (i = 0; i < i2c->count - 1; i++)
> meson_i2c_add_token(i2c, TOKEN_DATA);
>
> - if (i2c->count) {
> - if (write || i2c->pos + i2c->count < i2c->msg->len)
> - meson_i2c_add_token(i2c, TOKEN_DATA);
> - else
> - meson_i2c_add_token(i2c, TOKEN_DATA_LAST);
> - }
> + if (write || i2c->pos + i2c->count < i2c->msg->len)
> + meson_i2c_add_token(i2c, TOKEN_DATA);
> + else
> + meson_i2c_add_token(i2c, TOKEN_DATA_LAST);
>
> if (write)
> meson_i2c_put_data(i2c, i2c->msg->buf + i2c->pos, i2c->count);
> @@ -257,11 +255,8 @@ static irqreturn_t meson_i2c_irq(int irqno, void *dev_id)
>
> switch (i2c->state) {
> case STATE_READ:
> - if (i2c->count > 0) {
> - meson_i2c_get_data(i2c, i2c->msg->buf + i2c->pos,
> - i2c->count);
> - i2c->pos += i2c->count;
> - }
> + meson_i2c_get_data(i2c, i2c->msg->buf + i2c->pos, i2c->count);
> + i2c->pos += i2c->count;
>
> if (i2c->pos >= i2c->msg->len) {
> meson_i2c_stop(i2c);
> @@ -371,6 +366,9 @@ static int meson_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs,
> clk_enable(i2c->clk);
>
> for (i = 0; i < num; i++) {
> + /* ignore messages with length 0 */
> + if (!msgs[i].len)
> + continue;
> ret = meson_i2c_xfer_msg(i2c, &msgs[i], i == num - 1);
> if (ret)
> break;
> --
> 2.12.0
>
>
>
> _______________________________________________
> linux-amlogic mailing list
> linux-amlogic at lists.infradead.org <mailto:linux-amlogic@lists.infradead.org>
> http://lists.infradead.org/mailman/listinfo/linux-amlogic <http://lists.infradead.org/mailman/listinfo/linux-amlogic>
>
next prev parent reply other threads:[~2017-03-08 22:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-08 6:41 [PATCH 00/12] i2c: meson: series with improvements Heiner Kallweit
2017-03-08 6:42 ` [PATCH 01/12] i2c: meson: use min instead of min_t where min_t isn't needed Heiner Kallweit
2017-03-08 9:25 ` Jerome Brunet
2017-03-08 6:43 ` [PATCH 02/12] i2c: meson: remove member irq from struct meson_i2c Heiner Kallweit
2017-03-08 9:07 ` Jerome Brunet
2017-03-08 6:44 ` [PATCH 03/12] i2c: meson: use i2c core for DT clock-frequency parsing Heiner Kallweit
2017-03-08 9:10 ` Jerome Brunet
2017-03-08 6:44 ` [PATCH 04/12] i2c: meson: use full 12 bits for clock divider Heiner Kallweit
2017-03-08 9:19 ` Jerome Brunet
2017-03-08 6:45 ` [PATCH 05/12] i2c: meson: set clock divider in probe instead of setting it for each transfer Heiner Kallweit
2017-03-08 6:46 ` [PATCH 06/12] i2c: meson: remove variable count from meson_i2c_xfer Heiner Kallweit
2017-03-08 9:28 ` Jerome Brunet
2017-03-08 6:47 ` [PATCH 07/12] i2c: meson: improve interrupt handler and detect spurious interrupts Heiner Kallweit
2017-03-08 9:50 ` Jerome Brunet
2017-03-08 21:02 ` Heiner Kallweit
2017-03-09 20:16 ` Heiner Kallweit
2017-03-08 6:47 ` [PATCH 08/12] i2c: meson: explicitly ignore messages with length zero Heiner Kallweit
[not found] ` <CANe6Qb9nKdLnOcwEwuk8NXEB+fxW2S_kkzP+U+qygYhNqz0Y0w@mail.gmail.com>
2017-03-08 22:03 ` Heiner Kallweit [this message]
2017-03-08 6:48 ` [PATCH 09/12] i2c: meson: don't create separate token chain just for the stop command Heiner Kallweit
2017-03-08 6:49 ` [PATCH 10/12] i2c: meson: remove meson_i2c_write_tokens Heiner Kallweit
2017-03-08 6:49 ` [PATCH 11/12] i2c: meson: improve and simplify interrupt handler Heiner Kallweit
2017-03-08 6:50 ` [PATCH 12/12] i2c: meson: use state in meson_i2c_prepare_xfer Heiner Kallweit
2017-03-08 9:34 ` [PATCH 00/12] i2c: meson: series with improvements Jerome Brunet
2017-03-08 20:49 ` Heiner Kallweit
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=00a0854d-b0f6-5711-0b6e-25f0f3fe9b4f@gmail.com \
--to=hkallweit1@gmail.com \
--cc=linus-amlogic@lists.infradead.org \
/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).