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

    diff --git a/drivers/mfd/madera-i2c.c b/drivers/mfd/madera-i2c.c
    index 915d2f95bad3..47e65d88feb0 100644
    --- a/drivers/mfd/madera-i2c.c
    +++ b/drivers/mfd/madera-i2c.c
    @@ -17,9 +17,9 @@

    #include "madera.h"

    -static int madera_i2c_probe(struct i2c_client *i2c,
    - const struct i2c_device_id *id)
    +static int madera_i2c_probe(struct i2c_client *i2c)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
    struct madera *madera;
    const struct regmap_config *regmap_16bit_config = NULL;
    const struct regmap_config *regmap_32bit_config = NULL;
    @@ -139,7 +139,7 @@ static struct i2c_driver madera_i2c_driver = {
    .pm = &madera_pm_ops,
    .of_match_table = of_match_ptr(madera_of_match),
    },
    - .probe = madera_i2c_probe,
    + .probe_new = madera_i2c_probe,
    .remove = madera_i2c_remove,
    .id_table = madera_i2c_id,
    };
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 00:35    [W:2.562 / U:0.700 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site