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 464/606] mfd: tc3589x: 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/tc3589x.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/mfd/tc3589x.c b/drivers/mfd/tc3589x.c
    index 5d932cf3808a..1f6e0d682cd9 100644
    --- a/drivers/mfd/tc3589x.c
    +++ b/drivers/mfd/tc3589x.c
    @@ -352,9 +352,9 @@ tc3589x_of_probe(struct device *dev, enum tc3589x_version *version)
    return pdata;
    }

    -static int tc3589x_probe(struct i2c_client *i2c,
    - const struct i2c_device_id *id)
    +static int tc3589x_probe(struct i2c_client *i2c)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
    struct device_node *np = i2c->dev.of_node;
    struct tc3589x_platform_data *pdata = dev_get_platdata(&i2c->dev);
    struct tc3589x *tc3589x;
    @@ -485,7 +485,7 @@ static struct i2c_driver tc3589x_driver = {
    .pm = pm_sleep_ptr(&tc3589x_dev_pm_ops),
    .of_match_table = of_match_ptr(tc3589x_match),
    },
    - .probe = tc3589x_probe,
    + .probe_new = tc3589x_probe,
    .remove = tc3589x_remove,
    .id_table = tc3589x_id,
    };
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 01:37    [W:3.180 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site