diff options
| author | Bastian Stender <bst@pengutronix.de> | 2017-02-23 17:34:50 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-03-02 14:03:43 +0100 |
| commit | 836b99c81b9f17414cbbbfdf1c4d92acfc7106ff (patch) | |
| tree | 8a97be48f8ce5d6616ed874c26f728913affba5c /drivers/i2c | |
| parent | 8d38b5205c4b2d2a7b437898119d0240e6e3ebfb (diff) | |
| download | barebox-836b99c81b9f17414cbbbfdf1c4d92acfc7106ff.tar.gz barebox-836b99c81b9f17414cbbbfdf1c4d92acfc7106ff.tar.xz | |
i2c: mv64xxx: simplify mv64xxx_i2c_wait_for_completion
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>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/i2c')
| -rw-r--r-- | drivers/i2c/busses/i2c-mv64xxx.c | 29 |
1 files 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"); |