From: Peter Rosin <peda@axentia.se>
To: linux-kernel@vger.kernel.org
Cc: Peter Rosin <peda@axentia.se>,
Linus Walleij <linus.walleij@linaro.org>,
linux-arm-kernel@lists.infradead.org, linux-i2c@vger.kernel.org,
Wolfram Sang <wsa+renesas@sang-engineering.com>
Subject: [PATCH 20/21] i2c: stu300: make use of i2c_8bit_addr_from_msg
Date: Mon, 14 May 2018 16:53:29 +0200 [thread overview]
Message-ID: <20180514145330.4857-21-peda@axentia.se> (raw)
In-Reply-To: <20180514145330.4857-1-peda@axentia.se>
Because it looks neater.
Also restructure debug output for resends, since that code as a
result is only handling debug output.
Signed-off-by: Peter Rosin <peda@axentia.se>
---
drivers/i2c/busses/i2c-stu300.c | 22 +++++++++++++---------
1 file changed, 13 insertions(+), 9 deletions(-)
diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c
index dc63236b45b2..e866c481bfc3 100644
--- a/drivers/i2c/busses/i2c-stu300.c
+++ b/drivers/i2c/busses/i2c-stu300.c
@@ -602,20 +602,24 @@ static int stu300_send_address(struct stu300_dev *dev,
u32 val;
int ret;
- if (msg->flags & I2C_M_TEN)
+ if (msg->flags & I2C_M_TEN) {
/* This is probably how 10 bit addresses look */
val = (0xf0 | (((u32) msg->addr & 0x300) >> 7)) &
I2C_DR_D_MASK;
- else
- val = ((msg->addr << 1) & I2C_DR_D_MASK);
+ if (msg->flags & I2C_M_RD)
+ /* This is the direction bit */
+ val |= 0x01;
+ } else {
+ val = i2c_8bit_addr_from_msg(msg);
+ }
- if (msg->flags & I2C_M_RD) {
- /* This is the direction bit */
- val |= 0x01;
- if (resend)
+ if (resend) {
+ if (msg->flags & I2C_M_RD)
dev_dbg(&dev->pdev->dev, "read resend\n");
- } else if (resend)
- dev_dbg(&dev->pdev->dev, "write resend\n");
+ else
+ dev_dbg(&dev->pdev->dev, "write resend\n");
+ }
+
stu300_wr8(val, dev->virtbase + I2C_DR);
/* For 10bit addressing, await 10bit request (EVENT 9) */
--
2.11.0
next prev parent reply other threads:[~2018-05-14 14:55 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-14 14:53 [PATCH 00/21] i2c: make use of i2c_8bit_addr_from_msg Peter Rosin
2018-05-14 14:53 ` [PATCH 01/21] i2c: algo: bit: " Peter Rosin
2018-05-14 14:53 ` [PATCH 02/21] i2c: algo: pca: " Peter Rosin
2018-05-14 14:53 ` [PATCH 03/21] i2c: algo: pcf: " Peter Rosin
2018-05-14 16:59 ` Andy Shevchenko
2018-05-14 17:03 ` Peter Rosin
2018-05-14 14:53 ` [PATCH 04/21] i2c: aspeed: " Peter Rosin
2018-05-14 14:53 ` [PATCH 05/21] i2c: axxia: " Peter Rosin
2018-05-14 14:53 ` [PATCH 06/21] i2c: diolan: " Peter Rosin
2018-05-14 15:50 ` Guenter Roeck
2018-05-14 14:53 ` [PATCH 07/21] i2c: efm32: " Peter Rosin
2018-05-14 18:27 ` Uwe Kleine-König
2018-05-14 14:53 ` [PATCH 08/21] i2c: eg20t: " Peter Rosin
2018-05-14 14:53 ` [PATCH 09/21] i2c: emev2: " Peter Rosin
2018-05-14 14:53 ` [PATCH 10/21] i2c: hix5hd2: " Peter Rosin
2018-05-14 14:53 ` [PATCH 11/21] i2c: imx-lpi2c: " Peter Rosin
2018-05-14 14:53 ` [PATCH 12/21] i2c: imx: " Peter Rosin
2018-05-14 18:32 ` Uwe Kleine-König
2018-05-14 14:53 ` [PATCH 13/21] i2c: kempld: " Peter Rosin
2018-05-14 14:53 ` [PATCH 14/21] i2c: mxs: " Peter Rosin
2018-05-14 14:53 ` [PATCH 15/21] i2c: ocores: " Peter Rosin
2018-05-14 14:53 ` [PATCH 16/21] i2c: pasemi: " Peter Rosin
2018-05-14 14:53 ` [PATCH 17/21] i2c: qup: " Peter Rosin
2018-05-14 14:53 ` [PATCH 18/21] i2c: rcar: " Peter Rosin
2018-05-14 14:53 ` [PATCH 19/21] i2c: riic: " Peter Rosin
2018-05-14 14:53 ` Peter Rosin [this message]
2018-05-14 19:54 ` [PATCH 20/21] i2c: stu300: " Linus Walleij
2018-05-14 14:53 ` [PATCH 21/21] i2c: xiic: " Peter Rosin
2018-05-14 16:11 ` [PATCH 00/21] i2c: " Joe Perches
2018-05-14 17:01 ` Peter Rosin
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=20180514145330.4857-21-peda@axentia.se \
--to=peda@axentia.se \
--cc=linus.walleij@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa+renesas@sang-engineering.com \
/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).