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 048/606] i2c: mux: pca954x: 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/i2c/muxes/i2c-mux-pca954x.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
    index a5f458b635df..3639e6d7304c 100644
    --- a/drivers/i2c/muxes/i2c-mux-pca954x.c
    +++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
    @@ -411,9 +411,9 @@ static int pca954x_init(struct i2c_client *client, struct pca954x *data)
    /*
    * I2C init/probing/exit functions
    */
    -static int pca954x_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int pca954x_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    struct i2c_adapter *adap = client->adapter;
    struct device *dev = &client->dev;
    struct gpio_desc *gpio;
    @@ -554,7 +554,7 @@ static struct i2c_driver pca954x_driver = {
    .pm = &pca954x_pm,
    .of_match_table = pca954x_of_match,
    },
    - .probe = pca954x_probe,
    + .probe_new = pca954x_probe,
    .remove = pca954x_remove,
    .id_table = pca954x_id,
    };
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-18 23:50    [W:2.237 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site