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 111/606] iio: imu: st_lsm6dsx: 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/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
    index 0faf1b4c11af..3570fac1b612 100644
    --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
    +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c
    @@ -21,9 +21,9 @@ static const struct regmap_config st_lsm6dsx_i2c_regmap_config = {
    .val_bits = 8,
    };

    -static int st_lsm6dsx_i2c_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int st_lsm6dsx_i2c_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    int hw_id = id->driver_data;
    struct regmap *regmap;

    @@ -152,7 +152,7 @@ static struct i2c_driver st_lsm6dsx_driver = {
    .pm = pm_sleep_ptr(&st_lsm6dsx_pm_ops),
    .of_match_table = st_lsm6dsx_i2c_of_match,
    },
    - .probe = st_lsm6dsx_i2c_probe,
    + .probe_new = st_lsm6dsx_i2c_probe,
    .id_table = st_lsm6dsx_i2c_id_table,
    };
    module_i2c_driver(st_lsm6dsx_driver);
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 01:13    [W:4.252 / U:1.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site