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

    diff --git a/drivers/mfd/tps65910.c b/drivers/mfd/tps65910.c
    index 67e2707af4bc..821c0277a2ed 100644
    --- a/drivers/mfd/tps65910.c
    +++ b/drivers/mfd/tps65910.c
    @@ -441,9 +441,9 @@ static void tps65910_power_off(void)
    DEVCTRL_DEV_OFF_MASK);
    }

    -static int tps65910_i2c_probe(struct i2c_client *i2c,
    - const struct i2c_device_id *id)
    +static int tps65910_i2c_probe(struct i2c_client *i2c)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
    struct tps65910 *tps65910;
    struct tps65910_board *pmic_plat_data;
    struct tps65910_board *of_pmic_plat_data = NULL;
    @@ -535,7 +535,7 @@ static struct i2c_driver tps65910_i2c_driver = {
    .name = "tps65910",
    .of_match_table = of_match_ptr(tps65910_of_match),
    },
    - .probe = tps65910_i2c_probe,
    + .probe_new = tps65910_i2c_probe,
    .id_table = tps65910_i2c_id,
    };

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