lkml.org 
[lkml]   [2022]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 481/606] mfd: wm8994-core: Convert to i2c's .probe_new()
    Date
    From: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

    .probe_new() doesn't get the i2c_device_id * parameter, so determine
    that explicitly in the probe function.

    Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
    ---
    drivers/mfd/wm8994-core.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
    index 4c0e9378094f..a89221bffde5 100644
    --- a/drivers/mfd/wm8994-core.c
    +++ b/drivers/mfd/wm8994-core.c
    @@ -621,9 +621,9 @@ static const struct of_device_id wm8994_of_match[] = {
    };
    MODULE_DEVICE_TABLE(of, wm8994_of_match);

    -static int wm8994_i2c_probe(struct i2c_client *i2c,
    - const struct i2c_device_id *id)
    +static int wm8994_i2c_probe(struct i2c_client *i2c)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
    const struct of_device_id *of_id;
    struct wm8994 *wm8994;
    int ret;
    @@ -681,7 +681,7 @@ static struct i2c_driver wm8994_i2c_driver = {
    .pm = pm_ptr(&wm8994_pm_ops),
    .of_match_table = wm8994_of_match,
    },
    - .probe = wm8994_i2c_probe,
    + .probe_new = wm8994_i2c_probe,
    .remove = wm8994_i2c_remove,
    .id_table = wm8994_i2c_id,
    };
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 00:39    [W:4.030 / U:0.164 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site