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 157/606] iio: magnetometer: mag3110: 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/magnetometer/mag3110.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/iio/magnetometer/mag3110.c b/drivers/iio/magnetometer/mag3110.c
    index b870ad803862..661176a885ad 100644
    --- a/drivers/iio/magnetometer/mag3110.c
    +++ b/drivers/iio/magnetometer/mag3110.c
    @@ -469,9 +469,9 @@ static const struct iio_info mag3110_info = {

    static const unsigned long mag3110_scan_masks[] = {0x7, 0xf, 0};

    -static int mag3110_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int mag3110_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    struct mag3110_data *data;
    struct iio_dev *indio_dev;
    int ret;
    @@ -641,7 +641,7 @@ static struct i2c_driver mag3110_driver = {
    .of_match_table = mag3110_of_match,
    .pm = pm_sleep_ptr(&mag3110_pm_ops),
    },
    - .probe = mag3110_probe,
    + .probe_new = mag3110_probe,
    .remove = mag3110_remove,
    .id_table = mag3110_id,
    };
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 00:24    [W:6.349 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site