Commit bb09c94d authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mauro Carvalho Chehab

media: i2c/tvp514x: Convert to i2c's .probe_new()

.probe_new() doesn't get the i2c_device_id * parameter, so determine
that explicitly in the probe function.

[hverkuil: remove obsolete kerneldoc 'id' documentation]
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 7db820b1
...@@ -1017,14 +1017,14 @@ tvp514x_get_pdata(struct i2c_client *client) ...@@ -1017,14 +1017,14 @@ tvp514x_get_pdata(struct i2c_client *client)
/** /**
* tvp514x_probe() - decoder driver i2c probe handler * tvp514x_probe() - decoder driver i2c probe handler
* @client: i2c driver client device structure * @client: i2c driver client device structure
* @id: i2c driver id table
* *
* Register decoder as an i2c client device and V4L2 * Register decoder as an i2c client device and V4L2
* device. * device.
*/ */
static int static int
tvp514x_probe(struct i2c_client *client, const struct i2c_device_id *id) tvp514x_probe(struct i2c_client *client)
{ {
const struct i2c_device_id *id = i2c_client_get_device_id(client);
struct tvp514x_platform_data *pdata = tvp514x_get_pdata(client); struct tvp514x_platform_data *pdata = tvp514x_get_pdata(client);
struct tvp514x_decoder *decoder; struct tvp514x_decoder *decoder;
struct v4l2_subdev *sd; struct v4l2_subdev *sd;
...@@ -1208,7 +1208,7 @@ static struct i2c_driver tvp514x_driver = { ...@@ -1208,7 +1208,7 @@ static struct i2c_driver tvp514x_driver = {
.of_match_table = of_match_ptr(tvp514x_of_match), .of_match_table = of_match_ptr(tvp514x_of_match),
.name = TVP514X_MODULE_NAME, .name = TVP514X_MODULE_NAME,
}, },
.probe = tvp514x_probe, .probe_new = tvp514x_probe,
.remove = tvp514x_remove, .remove = tvp514x_remove,
.id_table = tvp514x_id, .id_table = tvp514x_id,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment