Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b71026c authored by Wolfram Sang's avatar Wolfram Sang Committed by Wolfram Sang
Browse files

i2c: recovery: refactor recovery function 



After exiting the while loop, we checked if recovery was successful and
sent a STOP to the clients. Meanwhile however, we send a STOP after
every pulse, so it is not needed after the loop. If we move the check
for a free bus to the end of the while loop, we can shorten and simplify
the logic. It is still ensured that at least one STOP will be sent to
the wire even if SDA was not stuck low.

Signed-off-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: default avatarPeter Rosin <peda@axentia.se>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent ffc59c49

drivers/i2c/i2c-core-base.c

+6 −18
Original line number Diff line number Diff line
@@ -191,9 +191,6 @@ int i2c_generic_scl_recovery(struct i2c_adapter *adap) 
				ret = -EBUSY;

				break;

			}

			/* Break if SDA is high */

			if (bri->get_sda && bri->get_sda(adap))

				break;

		}



		val = !val;
@@ -209,22 +206,13 @@ int i2c_generic_scl_recovery(struct i2c_adapter *adap) 
		if (bri->set_sda)

			bri->set_sda(adap, val);

		ndelay(RECOVERY_NDELAY / 2);

	}



	/* check if recovery actually succeeded */

	if (bri->get_sda && !bri->get_sda(adap))

		ret = -EBUSY;



	/* If all went well, send STOP for a sane bus state. */

	if (ret == 0 && bri->set_sda) {

		bri->set_scl(adap, 0);

		ndelay(RECOVERY_NDELAY / 2);

		bri->set_sda(adap, 0);

		ndelay(RECOVERY_NDELAY / 2);

		bri->set_scl(adap, 1);

		ndelay(RECOVERY_NDELAY / 2);

		bri->set_sda(adap, 1);

		ndelay(RECOVERY_NDELAY / 2);

		/* Break if SDA is high */

		if (val && bri->get_sda) {

			ret = bri->get_sda(adap) ? 0 : -EBUSY;

			if (ret == 0)

				break;

		}

	}



	if (bri->unprepare_recovery)