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

Commit 2b2190a3 authored by Grygorii Strashko's avatar Grygorii Strashko Committed by Wolfram Sang
Browse files

i2c: change input parameter to i2c_adapter for prepare/unprepare_recovery 



This patch changes type of input parameter for
prepare/unprepare_recovery() callbacks from struct i2c_bus_recovery_info
* to struct i2c_adapter *. This allows to simplify implementation of
these callbacks and avoid type conversations from i2c_bus_recovery_info
to i2c_adapter. The i2c_bus_recovery_info can be simply retrieved from
struct i2c_adapter which contains pointer on it. There are no users
currently, so this is safe to do.

Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarAlexander Sverdlin <alexander.sverdlin@nokia.com>
Signed-off-by: default avatarGrygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent 623e4ecb

drivers/i2c/i2c-core.c

+2 −2
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ static int i2c_generic_recovery(struct i2c_adapter *adap) 
	int i = 0, val = 1, ret = 0;



	if (bri->prepare_recovery)

		bri->prepare_recovery(bri);

		bri->prepare_recovery(adap);



	/*

	 * By this time SCL is high, as we need to give 9 falling-rising edges
@@ -586,7 +586,7 @@ static int i2c_generic_recovery(struct i2c_adapter *adap) 
	}



	if (bri->unprepare_recovery)

		bri->unprepare_recovery(bri);

		bri->unprepare_recovery(adap);



	return ret;

}

include/linux/i2c.h

+2 −2
Original line number Diff line number Diff line
@@ -435,8 +435,8 @@ struct i2c_bus_recovery_info { 
	void (*set_scl)(struct i2c_adapter *, int val);

	int (*get_sda)(struct i2c_adapter *);



	void (*prepare_recovery)(struct i2c_bus_recovery_info *bri);

	void (*unprepare_recovery)(struct i2c_bus_recovery_info *bri);

	void (*prepare_recovery)(struct i2c_adapter *);

	void (*unprepare_recovery)(struct i2c_adapter *);



	/* gpio recovery */

	int scl_gpio;