Hi! On 01/12/14 16:34, Grygorii Strashko wrote: > 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. > > CC: Sekhar Nori <[email protected]> > CC: Kevin Hilman <[email protected]> > CC: Santosh Shilimkar <[email protected]> > CC: Murali Karicheri <[email protected]> > Acked-by: Uwe Kleine-König <[email protected]> > Signed-off-by: Grygorii Strashko <[email protected]> > --- > drivers/i2c/i2c-core.c | 4 ++-- > include/linux/i2c.h | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c > index 2f90ac6..72b6e34 100644 > --- a/drivers/i2c/i2c-core.c > +++ b/drivers/i2c/i2c-core.c > @@ -563,7 +563,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 > @@ -588,7 +588,7 @@ static int i2c_generic_recovery(struct i2c_adapter *adap) > } > > if (bri->unprepare_recovery) > - bri->unprepare_recovery(bri); > + bri->unprepare_recovery(adap); > > return ret; > } > diff --git a/include/linux/i2c.h b/include/linux/i2c.h > index b556e0a..cf9380f 100644 > --- a/include/linux/i2c.h > +++ b/include/linux/i2c.h > @@ -404,8 +404,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; >
Acked-by: Alexander Sverdlin <[email protected]> -- Best regards, Alexander Sverdlin. Sent from my pdp-11 -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
