On Fri, Apr 15, 2011 at 5:13 AM, Jean Delvare <khali@xxxxxxxxxxxx> wrote:
> Now that we pass the i2c_adapter as the first parameter, it makes
> little sense to pass its name separately as the second.
>
> Signed-off-by: Jean Delvare <khali@xxxxxxxxxxxx>
> Cc: Alex Deucher <alexdeucher@xxxxxxxxx>
> ---
> Alex, I think it would make sense to merge this into your own patch?
>
Yeah, looks good to me. Do you want to merge them or do you want me
to send new patch?
Reviewed-by: Alex Deucher <alexdeucher@xxxxxxxxx>
> drivers/i2c/algos/i2c-algo-bit.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> --- linux-2.6.39-rc3.orig/drivers/i2c/algos/i2c-algo-bit.c 2011-04-15 10:47:39.000000000 +0200
> +++ linux-2.6.39-rc3/drivers/i2c/algos/i2c-algo-bit.c 2011-04-15 11:05:09.000000000 +0200
> @@ -232,9 +232,10 @@ static int i2c_inb(struct i2c_adapter *i
> * Sanity check for the adapter hardware - check the reaction of
> * the bus lines only if it seems to be idle.
> */
> -static int test_bus(struct i2c_adapter *i2c_adap, char *name)
> +static int test_bus(struct i2c_adapter *i2c_adap)
> {
> struct i2c_algo_bit_data *adap = i2c_adap->algo_data;
> + const char *name = i2c_adap->name;
> int scl, sda, ret;
>
> if (adap->pre_xfer) {
> @@ -622,7 +623,7 @@ static int __i2c_bit_add_bus(struct i2c_
> int ret;
>
> if (bit_test) {
> - ret = test_bus(adap, adap->name);
> + ret = test_bus(adap);
> if (ret < 0)
> return -ENODEV;
> }
>
>
> --
> Jean Delvare
>
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
