From: Bastian Stender <bst@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Bastian Stender <bst@pengutronix.de>
Subject: [PATCH 2/2] i2c: mv64xxx: simplify mv64xxx_i2c_wait_for_completion
Date: Thu, 23 Feb 2017 17:34:50 +0100 [thread overview]
Message-ID: <20170223163450.6611-2-bst@pengutronix.de> (raw)
In-Reply-To: <20170223163450.6611-1-bst@pengutronix.de>
Two nested while loops are not necessary here, so integrate the read,
i2c_fsm and i2c_do_action calls into mv64xxx_i2c_wait_for_completion()
and remove the obsolete interrupt remains.
Signed-off-by: Bastian Stender <bst@pengutronix.de>
---
drivers/i2c/busses/i2c-mv64xxx.c | 29 ++++++++---------------------
1 file changed, 8 insertions(+), 21 deletions(-)
diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c
index 45d5a2b6dc..caece3b78e 100644
--- a/drivers/i2c/busses/i2c-mv64xxx.c
+++ b/drivers/i2c/busses/i2c-mv64xxx.c
@@ -414,26 +414,6 @@ mv64xxx_i2c_do_action(struct mv64xxx_i2c_data *drv_data)
}
}
-static void mv64xxx_i2c_intr(struct mv64xxx_i2c_data *drv_data)
-{
- u32 status;
- uint64_t start;
-
- start = get_time_ns();
-
- while (mv64xxx_read(drv_data, drv_data->reg_offsets.control) &
- REG_CONTROL_IFLG) {
- status = mv64xxx_read(drv_data, drv_data->reg_offsets.status);
- mv64xxx_i2c_fsm(drv_data, status);
- mv64xxx_i2c_do_action(drv_data);
-
- if (is_timeout_non_interruptible(start, 3 * SECOND)) {
- drv_data->rc = -EIO;
- break;
- }
- }
-}
-
/*
*****************************************************************************
*
@@ -444,8 +424,15 @@ static void mv64xxx_i2c_intr(struct mv64xxx_i2c_data *drv_data)
static void
mv64xxx_i2c_wait_for_completion(struct mv64xxx_i2c_data *drv_data)
{
+ u32 status;
do {
- mv64xxx_i2c_intr(drv_data);
+ if (mv64xxx_read(drv_data, drv_data->reg_offsets.control) &
+ REG_CONTROL_IFLG) {
+ status = mv64xxx_read(drv_data,
+ drv_data->reg_offsets.status);
+ mv64xxx_i2c_fsm(drv_data, status);
+ mv64xxx_i2c_do_action(drv_data);
+ }
if (drv_data->rc) {
drv_data->state = STATE_IDLE;
dev_err(&drv_data->adapter.dev, "I2C bus error\n");
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2017-02-23 16:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-23 16:34 [PATCH 1/2] i2c: mv64xxx: add software delays Bastian Stender
2017-02-23 16:34 ` Bastian Stender [this message]
2017-02-24 7:24 ` Sascha Hauer
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=20170223163450.6611-2-bst@pengutronix.de \
--to=bst@pengutronix.de \
--cc=barebox@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