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

    diff --git a/drivers/mfd/mc13xxx-i2c.c b/drivers/mfd/mc13xxx-i2c.c
    index 89ab01105460..633b973a5ba7 100644
    --- a/drivers/mfd/mc13xxx-i2c.c
    +++ b/drivers/mfd/mc13xxx-i2c.c
    @@ -51,9 +51,9 @@ static const struct regmap_config mc13xxx_regmap_i2c_config = {
    .cache_type = REGCACHE_NONE,
    };

    -static int mc13xxx_i2c_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int mc13xxx_i2c_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    struct mc13xxx *mc13xxx;
    int ret;

    @@ -95,7 +95,7 @@ static struct i2c_driver mc13xxx_i2c_driver = {
    .name = "mc13xxx",
    .of_match_table = mc13xxx_dt_ids,
    },
    - .probe = mc13xxx_i2c_probe,
    + .probe_new = mc13xxx_i2c_probe,
    .remove = mc13xxx_i2c_remove,
    };

    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 00:31    [W:2.649 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site