Commit 2d26698e authored by Hans Verkuil's avatar Hans Verkuil Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (10731): zoran i2c modules: remove i2c autoprobing support. 



Zoran doesn't do autoprobing anymore, so remove support for this from the
i2c modules.

Signed-off-by: default avatarHans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 7f6adeaf

drivers/media/video/adv7170.c

+1 −15
Original line number Diff line number Diff line
@@ -37,19 +37,12 @@ 
#include <linux/videodev2.h>

#include <media/v4l2-device.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-i2c-drv-legacy.h>

#include <media/v4l2-i2c-drv.h>



MODULE_DESCRIPTION("Analog Devices ADV7170 video encoder driver");

MODULE_AUTHOR("Maxim Yevtyushkin");

MODULE_LICENSE("GPL");



static unsigned short normal_i2c[] = {

	0xd4 >> 1, 0xd6 >> 1,	/* adv7170 IDs */

	0x54 >> 1, 0x56 >> 1,	/* adv7171 IDs */

	I2C_CLIENT_END

};



I2C_CLIENT_INSMOD;



static int debug;

module_param(debug, int, 0);
@@ -271,11 +264,6 @@ static int adv7170_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ide 
	return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7170, 0);

}



static int adv7170_command(struct i2c_client *client, unsigned cmd, void *arg)

{

	return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);

}



/* ----------------------------------------------------------------------- */



static const struct v4l2_subdev_core_ops adv7170_core_ops = {
@@ -348,8 +336,6 @@ MODULE_DEVICE_TABLE(i2c, adv7170_id); 


static struct v4l2_i2c_driver_data v4l2_i2c_data = {

	.name = "adv7170",

	.driverid = I2C_DRIVERID_ADV7170,

	.command = adv7170_command,

	.probe = adv7170_probe,

	.remove = adv7170_remove,

	.id_table = adv7170_id,

drivers/media/video/adv7175.c

+1 −15
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#include <linux/videodev2.h>

#include <media/v4l2-device.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-i2c-drv-legacy.h>

#include <media/v4l2-i2c-drv.h>



MODULE_DESCRIPTION("Analog Devices ADV7175 video encoder driver");

MODULE_AUTHOR("Dave Perks");
@@ -42,13 +42,6 @@ MODULE_LICENSE("GPL"); 
#define   I2C_ADV7175        0xd4

#define   I2C_ADV7176        0x54



static unsigned short normal_i2c[] = {

	I2C_ADV7175 >> 1, (I2C_ADV7175 >> 1) + 1,

	I2C_ADV7176 >> 1, (I2C_ADV7176 >> 1) + 1,

	I2C_CLIENT_END

};



I2C_CLIENT_INSMOD;



static int debug;

module_param(debug, int, 0);
@@ -309,11 +302,6 @@ static int adv7175_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ide 
	return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_ADV7175, 0);

}



static int adv7175_command(struct i2c_client *client, unsigned cmd, void *arg)

{

	return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);

}



/* ----------------------------------------------------------------------- */



static const struct v4l2_subdev_core_ops adv7175_core_ops = {
@@ -387,8 +375,6 @@ MODULE_DEVICE_TABLE(i2c, adv7175_id); 


static struct v4l2_i2c_driver_data v4l2_i2c_data = {

	.name = "adv7175",

	.driverid = I2C_DRIVERID_ADV7175,

	.command = adv7175_command,

	.probe = adv7175_probe,

	.remove = adv7175_remove,

	.id_table = adv7175_id,

drivers/media/video/bt819.c

+1 −11
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
#include <linux/videodev2.h>

#include <media/v4l2-device.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-i2c-drv-legacy.h>

#include <media/v4l2-i2c-drv.h>



MODULE_DESCRIPTION("Brooktree-819 video decoder driver");

MODULE_AUTHOR("Mike Bernson & Dave Perks");
@@ -48,9 +48,6 @@ static int debug; 
module_param(debug, int, 0);

MODULE_PARM_DESC(debug, "Debug level (0-1)");



static unsigned short normal_i2c[] = { 0x8a >> 1, I2C_CLIENT_END };



I2C_CLIENT_INSMOD;



/* ----------------------------------------------------------------------- */
@@ -428,11 +425,6 @@ static int bt819_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident 
	return v4l2_chip_ident_i2c_client(client, chip, decoder->ident, 0);

}



static int bt819_command(struct i2c_client *client, unsigned cmd, void *arg)

{

	return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);

}



/* ----------------------------------------------------------------------- */



static const struct v4l2_subdev_core_ops bt819_core_ops = {
@@ -537,8 +529,6 @@ MODULE_DEVICE_TABLE(i2c, bt819_id); 


static struct v4l2_i2c_driver_data v4l2_i2c_data = {

	.name = "bt819",

	.driverid = I2C_DRIVERID_BT819,

	.command = bt819_command,

	.probe = bt819_probe,

	.remove = bt819_remove,

	.id_table = bt819_id,

drivers/media/video/bt856.c

+1 −11
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <linux/videodev2.h>

#include <media/v4l2-device.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-i2c-drv-legacy.h>

#include <media/v4l2-i2c-drv.h>



MODULE_DESCRIPTION("Brooktree-856A video encoder driver");

MODULE_AUTHOR("Mike Bernson & Dave Perks");
@@ -47,9 +47,6 @@ static int debug; 
module_param(debug, int, 0);

MODULE_PARM_DESC(debug, "Debug level (0-1)");



static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };



I2C_CLIENT_INSMOD;



/* ----------------------------------------------------------------------- */
@@ -187,11 +184,6 @@ static int bt856_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident 
	return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_BT856, 0);

}



static int bt856_command(struct i2c_client *client, unsigned cmd, void *arg)

{

	return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);

}



/* ----------------------------------------------------------------------- */



static const struct v4l2_subdev_core_ops bt856_core_ops = {
@@ -270,8 +262,6 @@ MODULE_DEVICE_TABLE(i2c, bt856_id); 


static struct v4l2_i2c_driver_data v4l2_i2c_data = {

	.name = "bt856",

	.driverid = I2C_DRIVERID_BT856,

	.command = bt856_command,

	.probe = bt856_probe,

	.remove = bt856_remove,

	.id_table = bt856_id,

drivers/media/video/bt866.c

+1 −17
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#include <linux/videodev2.h>

#include <media/v4l2-device.h>

#include <media/v4l2-chip-ident.h>

#include <media/v4l2-i2c-drv-legacy.h>

#include <media/v4l2-i2c-drv.h>



MODULE_DESCRIPTION("Brooktree-866 video encoder driver");

MODULE_AUTHOR("Mike Bernson & Dave Perks");
@@ -47,9 +47,6 @@ static int debug; 
module_param(debug, int, 0);

MODULE_PARM_DESC(debug, "Debug level (0-1)");



static unsigned short normal_i2c[] = { 0x88 >> 1, I2C_CLIENT_END };



I2C_CLIENT_INSMOD;



/* ----------------------------------------------------------------------- */
@@ -185,11 +182,6 @@ static int bt866_g_chip_ident(struct v4l2_subdev *sd, struct v4l2_dbg_chip_ident 
	return v4l2_chip_ident_i2c_client(client, chip, V4L2_IDENT_BT866, 0);

}



static int bt866_command(struct i2c_client *client, unsigned cmd, void *arg)

{

	return v4l2_subdev_command(i2c_get_clientdata(client), cmd, arg);

}



/* ----------------------------------------------------------------------- */



static const struct v4l2_subdev_core_ops bt866_core_ops = {
@@ -232,11 +224,6 @@ static int bt866_remove(struct i2c_client *client) 
	return 0;

}



static int bt866_legacy_probe(struct i2c_adapter *adapter)

{

	return adapter->id == I2C_HW_B_ZR36067;

}



static const struct i2c_device_id bt866_id[] = {

	{ "bt866", 0 },

	{ }
@@ -245,10 +232,7 @@ MODULE_DEVICE_TABLE(i2c, bt866_id); 


static struct v4l2_i2c_driver_data v4l2_i2c_data = {

	.name = "bt866",

	.driverid = I2C_DRIVERID_BT866,

	.command = bt866_command,

	.probe = bt866_probe,

	.remove = bt866_remove,

	.legacy_probe = bt866_legacy_probe,

	.id_table = bt866_id,

};