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

    diff --git a/drivers/regulator/act8865-regulator.c b/drivers/regulator/act8865-regulator.c
    index 19b9742c9ecc..53f2c75cdeb4 100644
    --- a/drivers/regulator/act8865-regulator.c
    +++ b/drivers/regulator/act8865-regulator.c
    @@ -651,9 +651,9 @@ static int act8600_charger_probe(struct device *dev, struct regmap *regmap)
    return PTR_ERR_OR_ZERO(charger);
    }

    -static int act8865_pmic_probe(struct i2c_client *client,
    - const struct i2c_device_id *i2c_id)
    +static int act8865_pmic_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *i2c_id = i2c_client_get_device_id(client);
    const struct regulator_desc *regulators;
    struct act8865_platform_data *pdata = NULL;
    struct device *dev = &client->dev;
    @@ -790,7 +790,7 @@ static struct i2c_driver act8865_pmic_driver = {
    .driver = {
    .name = "act8865",
    },
    - .probe = act8865_pmic_probe,
    + .probe_new = act8865_pmic_probe,
    .id_table = act8865_ids,
    };

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