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: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Alexander Sverdlin <alexander.sverdlin@nokia.com>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index fe80f85896e267ca8dfb3c35aa07504bacfef39d..617a19acf76af98c6ffe28e891e2ffd9ef883c05 100644 (file)
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -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;
 }

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index c5e4bb2c57597cb16983cc2f884e2b8e4aeb6e5c..898033f41d767dda360b6a1d0a4b8361c8a1a5a3 100644 (file)
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -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;