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

    diff --git a/drivers/iio/pressure/mpl115_i2c.c b/drivers/iio/pressure/mpl115_i2c.c
    index 555bda1146fb..ade4dd854ddf 100644
    --- a/drivers/iio/pressure/mpl115_i2c.c
    +++ b/drivers/iio/pressure/mpl115_i2c.c
    @@ -35,9 +35,9 @@ static const struct mpl115_ops mpl115_i2c_ops = {
    .write = mpl115_i2c_write,
    };

    -static int mpl115_i2c_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int mpl115_i2c_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA))
    return -EOPNOTSUPP;

    @@ -55,7 +55,7 @@ static struct i2c_driver mpl115_i2c_driver = {
    .name = "mpl115",
    .pm = pm_ptr(&mpl115_dev_pm_ops),
    },
    - .probe = mpl115_i2c_probe,
    + .probe_new = mpl115_i2c_probe,
    .id_table = mpl115_i2c_id,
    };
    module_i2c_driver(mpl115_i2c_driver);
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 00:51    [W:4.112 / U:0.080 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site