Commit d1560d57 authored by Biju Das's avatar Biju Das Committed by Hans Verkuil
Browse files

media: i2c: video-i2c: Convert enum->pointer for data in the match tables 



Convert enum->pointer for data in the match tables, so that
device_get_match_data() can do match against OF/ACPI/I2C tables, once i2c
bus type match support added to it.

Replace enum->struct *video_i2c_chip for data in the match table. Simplify
the probe() by replacing device_get_match_data() and ID lookup for
retrieving data by i2c_get_match_data().

Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent a111f024

drivers/media/i2c/video-i2c.c

+4 −8
Original line number Diff line number Diff line
@@ -759,7 +759,6 @@ static void video_i2c_release(struct video_device *vdev) 


static int video_i2c_probe(struct i2c_client *client)

{

	const struct i2c_device_id *id = i2c_client_get_device_id(client);

	struct video_i2c_data *data;

	struct v4l2_device *v4l2_dev;

	struct vb2_queue *queue;
@@ -769,11 +768,8 @@ static int video_i2c_probe(struct i2c_client *client) 
	if (!data)

		return -ENOMEM;



	if (dev_fwnode(&client->dev))

		data->chip = device_get_match_data(&client->dev);

	else if (id)

		data->chip = &video_i2c_chip[id->driver_data];

	else

	data->chip = i2c_get_match_data(client);

	if (!data->chip)

		goto error_free_device;



	data->regmap = regmap_init_i2c(client, data->chip->regmap_config);
@@ -940,8 +936,8 @@ static const struct dev_pm_ops video_i2c_pm_ops = { 
};



static const struct i2c_device_id video_i2c_id_table[] = {

	{ "amg88xx", AMG88XX },

	{ "mlx90640", MLX90640 },

	{ "amg88xx", (kernel_ulong_t)&video_i2c_chip[AMG88XX] },

	{ "mlx90640", (kernel_ulong_t)&video_i2c_chip[MLX90640] },

	{}

};

MODULE_DEVICE_TABLE(i2c, video_i2c_id_table);