From: Uwe Kleine-König Date: Fri, 18 Nov 2022 22:41:34 +0000 (+0100) Subject: media: i2c/ov7670: Convert to i2c's .probe_new() X-Git-Tag: v6.3-rc1~72^2~61 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=0529bfa08d35094827b3657248593710ae0bbce6;p=linux-2.6-block.git media: i2c/ov7670: Convert to i2c's .probe_new() .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 Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- 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, };