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@xxxxxxxxxxxxxx>
---
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@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
