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 368/606] media: i2c/saa7115: 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/media/i2c/saa7115.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/media/i2c/saa7115.c b/drivers/media/i2c/saa7115.c
    index 86e70a980218..efeda3956f81 100644
    --- a/drivers/media/i2c/saa7115.c
    +++ b/drivers/media/i2c/saa7115.c
    @@ -1804,9 +1804,9 @@ static int saa711x_detect_chip(struct i2c_client *client,
    return -ENODEV;
    }

    -static int saa711x_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int saa711x_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    struct saa711x_state *state;
    struct v4l2_subdev *sd;
    struct v4l2_ctrl_handler *hdl;
    @@ -1951,7 +1951,7 @@ static struct i2c_driver saa711x_driver = {
    .driver = {
    .name = "saa7115",
    },
    - .probe = saa711x_probe,
    + .probe_new = saa711x_probe,
    .remove = saa711x_remove,
    .id_table = saa711x_id,
    };
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 01:35    [W:3.310 / U:0.616 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site