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 511/606] pinctrl: sx150x: 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/pinctrl/pinctrl-sx150x.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/pinctrl/pinctrl-sx150x.c b/drivers/pinctrl/pinctrl-sx150x.c
    index a87ea3b95cf4..0b5ff99641e1 100644
    --- a/drivers/pinctrl/pinctrl-sx150x.c
    +++ b/drivers/pinctrl/pinctrl-sx150x.c
    @@ -1094,9 +1094,9 @@ static const struct regmap_config sx150x_regmap_config = {
    .volatile_reg = sx150x_reg_volatile,
    };

    -static int sx150x_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int sx150x_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    static const u32 i2c_funcs = I2C_FUNC_SMBUS_BYTE_DATA |
    I2C_FUNC_SMBUS_WRITE_WORD_DATA;
    struct device *dev = &client->dev;
    @@ -1252,7 +1252,7 @@ static struct i2c_driver sx150x_driver = {
    .name = "sx150x-pinctrl",
    .of_match_table = of_match_ptr(sx150x_of_match),
    },
    - .probe = sx150x_probe,
    + .probe_new = sx150x_probe,
    .id_table = sx150x_id,
    };

    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 00:39    [W:4.059 / U:4.764 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site