Commit 89cac3fa authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Mauro Carvalho Chehab
Browse files

media: i2c/saa7115: 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: 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 0529bfa0

drivers/media/i2c/saa7115.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1804,9 +1804,9 @@ static int saa711x_detect_chip(struct i2c_client *client, 
	return -ENODEV;

	return -ENODEV;

}

}





static int saa711x_probe(struct i2c_client *client,

static int saa711x_probe(struct i2c_client *client)

			 const struct i2c_device_id *id)

{

{

	const struct i2c_device_id *id = i2c_client_get_device_id(client);

	struct saa711x_state *state;

	struct saa711x_state *state;

	struct v4l2_subdev *sd;

	struct v4l2_subdev *sd;

	struct v4l2_ctrl_handler *hdl;

	struct v4l2_ctrl_handler *hdl;
@@ -1951,7 +1951,7 @@ static struct i2c_driver saa711x_driver = { 
	.driver = {

	.driver = {

		.name	= "saa7115",

		.name	= "saa7115",

	},

	},

	.probe		= saa711x_probe,

	.probe_new	= saa711x_probe,

	.remove		= saa711x_remove,

	.remove		= saa711x_remove,

	.id_table	= saa711x_id,

	.id_table	= saa711x_id,

};

};