Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a367dfb authored by Jean Delvare's avatar Jean Delvare Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (8246): tvaudio: Stop I2C driver ID abuse 



The tvaudio driver is using "official" I2C device IDs for internal
purpose. There must be some historical reason behind this but anyway,
it shouldn't do that. As the stored values are never used, the easiest
way to fix the problem is simply to remove them altogether.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent be99af66

drivers/media/video/tvaudio.c

+0 −13
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ typedef struct AUDIOCMD { 
/* chip description */

struct CHIPDESC {

	char       *name;             /* chip name         */

	int        id;                /* ID */

	int        addr_lo, addr_hi;  /* i2c address range */

	int        registers;         /* # of registers    */
@@ -1256,7 +1255,6 @@ module_param(ta8874z, int, 0444); 
static struct CHIPDESC chiplist[] = {

	{

		.name       = "tda9840",

		.id         = I2C_DRIVERID_TDA9840,

		.insmodopt  = &tda9840,

		.addr_lo    = I2C_ADDR_TDA9840 >> 1,

		.addr_hi    = I2C_ADDR_TDA9840 >> 1,
@@ -1272,7 +1270,6 @@ static struct CHIPDESC chiplist[] = { 
	},

	{

		.name       = "tda9873h",

		.id         = I2C_DRIVERID_TDA9873,

		.checkit    = tda9873_checkit,

		.insmodopt  = &tda9873,

		.addr_lo    = I2C_ADDR_TDA985x_L >> 1,
@@ -1293,7 +1290,6 @@ static struct CHIPDESC chiplist[] = { 
	},

	{

		.name       = "tda9874h/a",

		.id         = I2C_DRIVERID_TDA9874,

		.checkit    = tda9874a_checkit,

		.initialize = tda9874a_initialize,

		.insmodopt  = &tda9874a,
@@ -1306,7 +1302,6 @@ static struct CHIPDESC chiplist[] = { 
	},

	{

		.name       = "tda9850",

		.id         = I2C_DRIVERID_TDA9850,

		.insmodopt  = &tda9850,

		.addr_lo    = I2C_ADDR_TDA985x_L >> 1,

		.addr_hi    = I2C_ADDR_TDA985x_H >> 1,
@@ -1319,7 +1314,6 @@ static struct CHIPDESC chiplist[] = { 
	},

	{

		.name       = "tda9855",

		.id         = I2C_DRIVERID_TDA9855,

		.insmodopt  = &tda9855,

		.addr_lo    = I2C_ADDR_TDA985x_L >> 1,

		.addr_hi    = I2C_ADDR_TDA985x_H >> 1,
@@ -1344,7 +1338,6 @@ static struct CHIPDESC chiplist[] = { 
	},

	{

		.name       = "tea6300",

		.id         = I2C_DRIVERID_TEA6300,

		.insmodopt  = &tea6300,

		.addr_lo    = I2C_ADDR_TEA6300 >> 1,

		.addr_hi    = I2C_ADDR_TEA6300 >> 1,
@@ -1365,7 +1358,6 @@ static struct CHIPDESC chiplist[] = { 
	},

	{

		.name       = "tea6320",

		.id         = I2C_DRIVERID_TEA6300,

		.initialize = tea6320_initialize,

		.insmodopt  = &tea6320,

		.addr_lo    = I2C_ADDR_TEA6300 >> 1,
@@ -1387,7 +1379,6 @@ static struct CHIPDESC chiplist[] = { 
	},

	{

		.name       = "tea6420",

		.id         = I2C_DRIVERID_TEA6420,

		.insmodopt  = &tea6420,

		.addr_lo    = I2C_ADDR_TEA6420 >> 1,

		.addr_hi    = I2C_ADDR_TEA6420 >> 1,
@@ -1400,7 +1391,6 @@ static struct CHIPDESC chiplist[] = { 
	},

	{

		.name       = "tda8425",

		.id         = I2C_DRIVERID_TDA8425,

		.insmodopt  = &tda8425,

		.addr_lo    = I2C_ADDR_TDA8425 >> 1,

		.addr_hi    = I2C_ADDR_TDA8425 >> 1,
@@ -1424,7 +1414,6 @@ static struct CHIPDESC chiplist[] = { 
	},

	{

		.name       = "pic16c54 (PV951)",

		.id         = I2C_DRIVERID_PIC16C54_PV9,

		.insmodopt  = &pic16c54,

		.addr_lo    = I2C_ADDR_PIC16C54 >> 1,

		.addr_hi    = I2C_ADDR_PIC16C54>> 1,
@@ -1440,8 +1429,6 @@ static struct CHIPDESC chiplist[] = { 
	},

	{

		.name       = "ta8874z",

		.id         = -1,

		/*.id         = I2C_DRIVERID_TA8874Z, */

		.checkit    = ta8874z_checkit,

		.insmodopt  = &ta8874z,

		.addr_lo    = I2C_ADDR_TDA9840 >> 1,

include/linux/i2c-id.h

+0 −7
Original line number Diff line number Diff line
@@ -33,15 +33,11 @@ 


#define I2C_DRIVERID_MSP3400	 1

#define I2C_DRIVERID_TUNER	 2

#define I2C_DRIVERID_TDA8425	 4	/* stereo sound processor	*/

#define I2C_DRIVERID_TEA6420	 5	/* audio matrix switch		*/

#define I2C_DRIVERID_TEA6415C	 6	/* video matrix switch		*/

#define I2C_DRIVERID_TDA9840	 7	/* stereo sound processor	*/

#define I2C_DRIVERID_SAA7111A	 8	/* video input processor	*/

#define I2C_DRIVERID_SAA7185B	13	/* video encoder		*/

#define I2C_DRIVERID_TEA6300	18	/* audio mixer			*/

#define I2C_DRIVERID_TDA9850	20	/* audio mixer			*/

#define I2C_DRIVERID_TDA9855	21	/* audio mixer			*/

#define I2C_DRIVERID_SAA7110	22	/* video decoder		*/

#define I2C_DRIVERID_MGATVO	23	/* Matrox TVOut			*/

#define I2C_DRIVERID_SAA5249	24	/* SAA5249 and compatibles	*/
@@ -50,9 +46,7 @@ 
#define I2C_DRIVERID_TDA7432	27	/* Stereo sound processor	*/

#define I2C_DRIVERID_TVMIXER    28      /* Mixer driver for tv cards    */

#define I2C_DRIVERID_TVAUDIO    29      /* Generic TV sound driver      */

#define I2C_DRIVERID_TDA9873    31      /* TV sound decoder chip        */

#define I2C_DRIVERID_TDA9875    32      /* TV sound decoder chip        */

#define I2C_DRIVERID_PIC16C54_PV9 33    /* Audio mux/ir receiver        */

#define I2C_DRIVERID_BT819	40     /* video decoder			*/

#define I2C_DRIVERID_BT856	41     /* video encoder			*/

#define I2C_DRIVERID_VPX3220	42     /* video decoder+vbi/vtxt	*/
@@ -63,7 +57,6 @@ 
#define I2C_DRIVERID_INDYCAM	58	/* SGI IndyCam			*/

#define I2C_DRIVERID_OVCAMCHIP	61	/* OmniVision CMOS image sens.	*/

#define I2C_DRIVERID_MAX6900	63	/* MAX6900 real-time clock	*/

#define I2C_DRIVERID_TDA9874	66	/* TV sound decoder		*/

#define I2C_DRIVERID_SAA6752HS	67	/* MPEG2 encoder		*/

#define I2C_DRIVERID_TVEEPROM	68	/* TV EEPROM			*/

#define I2C_DRIVERID_WM8775	69	/* wm8775 audio processor	*/