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 529/606] power: supply: max17042_battery: 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/power/supply/max17042_battery.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/power/supply/max17042_battery.c b/drivers/power/supply/max17042_battery.c
    index ab031bbfbe78..89cabe8ed3b0 100644
    --- a/drivers/power/supply/max17042_battery.c
    +++ b/drivers/power/supply/max17042_battery.c
    @@ -1031,9 +1031,9 @@ static const struct power_supply_desc max17042_no_current_sense_psy_desc = {
    .num_properties = ARRAY_SIZE(max17042_battery_props) - 2,
    };

    -static int max17042_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int max17042_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    struct i2c_adapter *adapter = client->adapter;
    const struct power_supply_desc *max17042_desc = &max17042_psy_desc;
    struct power_supply_config psy_cfg = {};
    @@ -1220,7 +1220,7 @@ static struct i2c_driver max17042_i2c_driver = {
    .of_match_table = of_match_ptr(max17042_dt_match),
    .pm = &max17042_pm_ops,
    },
    - .probe = max17042_probe,
    + .probe_new = max17042_probe,
    .id_table = max17042_id,
    };
    module_i2c_driver(max17042_i2c_driver);
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 00:36    [W:2.747 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site