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

    diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c
    index f15ef2d13059..dddf9827b314 100644
    --- a/drivers/media/i2c/video-i2c.c
    +++ b/drivers/media/i2c/video-i2c.c
    @@ -757,9 +757,9 @@ static void video_i2c_release(struct video_device *vdev)
    kfree(data);
    }

    -static int video_i2c_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int video_i2c_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    struct video_i2c_data *data;
    struct v4l2_device *v4l2_dev;
    struct vb2_queue *queue;
    @@ -959,7 +959,7 @@ static struct i2c_driver video_i2c_driver = {
    .of_match_table = video_i2c_of_match,
    .pm = &video_i2c_pm_ops,
    },
    - .probe = video_i2c_probe,
    + .probe_new = video_i2c_probe,
    .remove = video_i2c_remove,
    .id_table = video_i2c_id_table,
    };
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 00:23    [W:4.024 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site