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

    diff --git a/drivers/iio/pressure/mpl3115.c b/drivers/iio/pressure/mpl3115.c
    index 2f22aba61e4d..72e811a5c96e 100644
    --- a/drivers/iio/pressure/mpl3115.c
    +++ b/drivers/iio/pressure/mpl3115.c
    @@ -230,9 +230,9 @@ static const struct iio_info mpl3115_info = {
    .read_raw = &mpl3115_read_raw,
    };

    -static int mpl3115_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int mpl3115_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    struct mpl3115_data *data;
    struct iio_dev *indio_dev;
    int ret;
    @@ -335,7 +335,7 @@ static struct i2c_driver mpl3115_driver = {
    .of_match_table = mpl3115_of_match,
    .pm = pm_sleep_ptr(&mpl3115_pm_ops),
    },
    - .probe = mpl3115_probe,
    + .probe_new = mpl3115_probe,
    .remove = mpl3115_remove,
    .id_table = mpl3115_id,
    };
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 00:40    [W:4.034 / U:0.980 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site