lkml.org 
[lkml]   [2016]   [May]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCHv5 7/8] mfd: 88pm860x: Move over to new I2C device .probe() call
    Date
    From: Lee Jones <lee.jones@linaro.org>

    As part of an effort to rid the mostly unused second parameter for I2C
    related .probe() functions and to conform to other existing frameworks
    we're moving over to a temporary replacement .probe() call-back.

    Acked-by: Grant Likely <grant.likely@linaro.org>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    Signed-off-by: Kieran Bingham <kieran@bingham.xyz>

    ---
    Changes since v4
    - Rename .probe2 to probe_new
    ---
    drivers/mfd/88pm860x-core.c | 5 ++---
    1 file changed, 2 insertions(+), 3 deletions(-)

    diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
    index 25e1aafae60c..227b99018657 100644
    --- a/drivers/mfd/88pm860x-core.c
    +++ b/drivers/mfd/88pm860x-core.c
    @@ -1132,8 +1132,7 @@ static int pm860x_dt_init(struct device_node *np,
    return 0;
    }

    -static int pm860x_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int pm860x_probe(struct i2c_client *client)
    {
    struct pm860x_platform_data *pdata = dev_get_platdata(&client->dev);
    struct device_node *node = client->dev.of_node;
    @@ -1259,7 +1258,7 @@ static struct i2c_driver pm860x_driver = {
    .pm = &pm860x_pm_ops,
    .of_match_table = pm860x_dt_ids,
    },
    - .probe = pm860x_probe,
    + .probe_new = pm860x_probe,
    .remove = pm860x_remove,
    .id_table = pm860x_id_table,
    };
    --
    2.5.0
    \
     
     \ /
      Last update: 2016-05-04 17:41    [W:2.158 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site