Browse Source

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>
Grygorii Strashko 10 years ago
parent
commit
2b2190a375
2 changed files with 4 additions and 4 deletions
  1. 2 2
      drivers/i2c/i2c-core.c
  2. 2 2
      include/linux/i2c.h

+ 2 - 2
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;
 	int i = 0, val = 1, ret = 0;
 
 
 	if (bri->prepare_recovery)
 	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
 	 * 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)
 	if (bri->unprepare_recovery)
-		bri->unprepare_recovery(bri);
+		bri->unprepare_recovery(adap);
 
 
 	return ret;
 	return ret;
 }
 }

+ 2 - 2
include/linux/i2c.h

@@ -435,8 +435,8 @@ struct i2c_bus_recovery_info {
 	void (*set_scl)(struct i2c_adapter *, int val);
 	void (*set_scl)(struct i2c_adapter *, int val);
 	int (*get_sda)(struct i2c_adapter *);
 	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 */
 	/* gpio recovery */
 	int scl_gpio;
 	int scl_gpio;