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

    diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c
    index 11d3bef65d43..27db0a07de1f 100644
    --- a/drivers/media/i2c/ov7670.c
    +++ b/drivers/media/i2c/ov7670.c
    @@ -1847,9 +1847,9 @@ static int ov7670_parse_dt(struct device *dev,
    return 0;
    }

    -static int ov7670_probe(struct i2c_client *client,
    - const struct i2c_device_id *id)
    +static int ov7670_probe(struct i2c_client *client)
    {
    + const struct i2c_device_id *id = i2c_client_get_device_id(client);
    struct v4l2_fract tpf;
    struct v4l2_subdev *sd;
    struct ov7670_info *info;
    @@ -2038,7 +2038,7 @@ static struct i2c_driver ov7670_driver = {
    .name = "ov7670",
    .of_match_table = of_match_ptr(ov7670_of_match),
    },
    - .probe = ov7670_probe,
    + .probe_new = ov7670_probe,
    .remove = ov7670_remove,
    .id_table = ov7670_id,
    };
    --
    2.38.1
    \
     
     \ /
      Last update: 2022-11-19 00:44    [W:3.661 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site