From 7bb823a6522afb03acbb117fd0d67ed5b7013bed Mon Sep 17 00:00:00 2001 From: Kieran Bingham Date: Wed, 10 Jul 2019 18:51:44 -0300 Subject: [PATCH] media: radio: si4713: Convert to new i2c device probe() The I2C core framework provides a simplified probe framework from commit b8a1a4cd5a98 ("i2c: Provide a temporary .probe_new() call-back type"). This driver does not utilise the i2c_device_id table in the probe, so we can easily convert it to utilise the simplified i2c driver registration. Signed-off-by: Kieran Bingham Reviewed-by: Wolfram Sang Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- drivers/media/radio/si4713/si4713.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/media/radio/si4713/si4713.c b/drivers/media/radio/si4713/si4713.c index 7d97de2..7f3aee4 100644 --- a/drivers/media/radio/si4713/si4713.c +++ b/drivers/media/radio/si4713/si4713.c @@ -1427,8 +1427,7 @@ static const struct v4l2_ctrl_config si4713_alt_freqs_ctrl = { * I2C driver interface */ /* si4713_probe - probe for the device */ -static int si4713_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int si4713_probe(struct i2c_client *client) { struct si4713_device *sdev; struct v4l2_ctrl_handler *hdl; @@ -1660,7 +1659,7 @@ static struct i2c_driver si4713_i2c_driver = { .name = "si4713", .of_match_table = of_match_ptr(si4713_of_match), }, - .probe = si4713_probe, + .probe_new = si4713_probe, .remove = si4713_remove, .id_table = si4713_id, }; -- 2.7.4