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

    diff --git a/drivers/power/supply/bq27xxx_battery_i2c.c b/drivers/power/supply/bq27xxx_battery_i2c.c
    index 94b00bb89c17..f8768997333b 100644
    --- a/drivers/power/supply/bq27xxx_battery_i2c.c
    +++ b/drivers/power/supply/bq27xxx_battery_i2c.c
    @@ -136,9 +136,9 @@ static int bq27xxx_battery_i2c_bulk_write(struct bq27xxx_device_info *di,
    return 0;
    }

    -static int bq27xxx_battery_i2c_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int bq27xxx_battery_i2c_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    struct bq27xxx_device_info *di;
    int ret;
    char *name;
    @@ -295,7 +295,7 @@ static struct i2c_driver bq27xxx_battery_i2c_driver = {
    .name = "bq27xxx-battery",
    .of_match_table = of_match_ptr(bq27xxx_battery_i2c_of_match_table),
    },
    - .probe = bq27xxx_battery_i2c_probe,
    + .probe_new = bq27xxx_battery_i2c_probe,
    .remove = bq27xxx_battery_i2c_remove,
    .id_table = bq27xxx_i2c_id_table,
    };
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 00:39    [W:4.110 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site