lkml.org 
[lkml]   [2014]   [Nov]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/5] i2c: recovery: change input parameter to i2c_adapter for prepare/unprepare_recovery
    Date
    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 <nsekhar@ti.com>
    CC: Kevin Hilman <khilman@deeprootsystems.com>
    CC: Santosh Shilimkar <ssantosh@kernel.org>
    CC: Murali Karicheri <m-karicheri2@ti.com>
    Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
    ---
    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;
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-11-20 11:41    [W:4.564 / U:0.076 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site