V4L/DVB (3548): Renamed I2C_foo addresses to I2C_ADDR_foo (09df1c16) · Commits · e / devices / android_kernel_teracube_2e

drivers/media/video/bt8xx/bt832.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,7 @@
	MODULE_LICENSE("GPL");		MODULE_LICENSE("GPL");

	/* Addresses to scan */		/* Addresses to scan */
	static unsigned short normal_i2c[] = { I2C_BT832_ALT1>>1, I2C_BT832_ALT2>>1,		static unsigned short normal_i2c[] = { I2C_ADDR_BT832_ALT1>>1, I2C_ADDR_BT832_ALT2>>1,
	I2C_CLIENT_END };		I2C_CLIENT_END };
	I2C_CLIENT_INSMOD;		I2C_CLIENT_INSMOD;

drivers/media/video/bt8xx/bttv-cards.c

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -3046,7 +3046,7 @@ static void miro_pinnacle_gpio(struct bttv *btv)
	gpio_inout(0xffffff, 0);		gpio_inout(0xffffff, 0);
	gpio = gpio_read();		gpio = gpio_read();
	id = ((gpio>>10) & 63) -1;		id = ((gpio>>10) & 63) -1;
	msp = bttv_I2CRead(btv, I2C_MSP3400, "MSP34xx");		msp = bttv_I2CRead(btv, I2C_ADDR_MSP3400, "MSP34xx");
	if (id < 32) {		if (id < 32) {
	btv->tuner_type = miro_tunermap[id];		btv->tuner_type = miro_tunermap[id];
	if (0 == (gpio & 0x20)) {		if (0 == (gpio & 0x20)) {
	@@ -3442,8 +3442,8 @@ void __devinit bttv_init_card2(struct bttv *btv)

	if (bttv_tvcards[btv->c.type].digital_mode == DIGITAL_MODE_CAMERA) {		if (bttv_tvcards[btv->c.type].digital_mode == DIGITAL_MODE_CAMERA) {
	/* detect Bt832 chip for quartzsight digital camera */		/* detect Bt832 chip for quartzsight digital camera */
	if ((bttv_I2CRead(btv, I2C_BT832_ALT1, "Bt832") >=0) \|\|		if ((bttv_I2CRead(btv, I2C_ADDR_BT832_ALT1, "Bt832") >=0) \|\|
	(bttv_I2CRead(btv, I2C_BT832_ALT2, "Bt832") >=0))		(bttv_I2CRead(btv, I2C_ADDR_BT832_ALT2, "Bt832") >=0))
	boot_bt832(btv);		boot_bt832(btv);
	}		}

	@@ -3452,19 +3452,19 @@ void __devinit bttv_init_card2(struct bttv *btv)

	/* try to detect audio/fader chips */		/* try to detect audio/fader chips */
	if (!bttv_tvcards[btv->c.type].no_msp34xx &&		if (!bttv_tvcards[btv->c.type].no_msp34xx &&
	bttv_I2CRead(btv, I2C_MSP3400, "MSP34xx") >=0)		bttv_I2CRead(btv, I2C_ADDR_MSP3400, "MSP34xx") >=0)
	request_module("msp3400");		request_module("msp3400");

	if (bttv_tvcards[btv->c.type].msp34xx_alt &&		if (bttv_tvcards[btv->c.type].msp34xx_alt &&
	bttv_I2CRead(btv, I2C_MSP3400_ALT, "MSP34xx (alternate address)") >=0)		bttv_I2CRead(btv, I2C_ADDR_MSP3400_ALT, "MSP34xx (alternate address)") >=0)
	request_module("msp3400");		request_module("msp3400");

	if (!bttv_tvcards[btv->c.type].no_tda9875 &&		if (!bttv_tvcards[btv->c.type].no_tda9875 &&
	bttv_I2CRead(btv, I2C_TDA9875, "TDA9875") >=0)		bttv_I2CRead(btv, I2C_ADDR_TDA9875, "TDA9875") >=0)
	request_module("tda9875");		request_module("tda9875");

	if (!bttv_tvcards[btv->c.type].no_tda7432 &&		if (!bttv_tvcards[btv->c.type].no_tda7432 &&
	bttv_I2CRead(btv, I2C_TDA7432, "TDA7432") >=0)		bttv_I2CRead(btv, I2C_ADDR_TDA7432, "TDA7432") >=0)
	request_module("tda7432");		request_module("tda7432");

	if (bttv_tvcards[btv->c.type].needs_tvaudio)		if (bttv_tvcards[btv->c.type].needs_tvaudio)
	@@ -3475,7 +3475,7 @@ void __devinit bttv_init_card2(struct bttv *btv)
	if (btv->tda9887_conf)		if (btv->tda9887_conf)
	tda9887 = 1;		tda9887 = 1;
	if (0 == tda9887 && 0 == bttv_tvcards[btv->c.type].has_dvb &&		if (0 == tda9887 && 0 == bttv_tvcards[btv->c.type].has_dvb &&
	bttv_I2CRead(btv, I2C_TDA9887, "TDA9887") >=0)		bttv_I2CRead(btv, I2C_ADDR_TDA9887, "TDA9887") >=0)
	tda9887 = 1;		tda9887 = 1;
	/* Hybrid DVB card, DOES have a tda9887 */		/* Hybrid DVB card, DOES have a tda9887 */
	if (btv->c.type == BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE)		if (btv->c.type == BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE)

drivers/media/video/mxb.c

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -198,13 +198,13 @@ static int mxb_probe(struct saa7146_dev* dev)
	/* loop through all i2c-devices on the bus and look who is there */		/* loop through all i2c-devices on the bus and look who is there */
	list_for_each(item,&mxb->i2c_adapter.clients) {		list_for_each(item,&mxb->i2c_adapter.clients) {
	client = list_entry(item, struct i2c_client, list);		client = list_entry(item, struct i2c_client, list);
	if( I2C_TEA6420_1 == client->addr )		if( I2C_ADDR_TEA6420_1 == client->addr )
	mxb->tea6420_1 = client;		mxb->tea6420_1 = client;
	if( I2C_TEA6420_2 == client->addr )		if( I2C_ADDR_TEA6420_2 == client->addr )
	mxb->tea6420_2 = client;		mxb->tea6420_2 = client;
	if( I2C_TEA6415C_2 == client->addr )		if( I2C_TEA6415C_2 == client->addr )
	mxb->tea6415c = client;		mxb->tea6415c = client;
	if( I2C_TDA9840 == client->addr )		if( I2C_ADDR_TDA9840 == client->addr )
	mxb->tda9840 = client;		mxb->tda9840 = client;
	if( I2C_SAA7111 == client->addr )		if( I2C_SAA7111 == client->addr )
	mxb->saa7111a = client;		mxb->saa7111a = client;

drivers/media/video/tda7432.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -71,7 +71,7 @@ module_param(maxvol, int, S_IRUGO \| S_IWUSR);

	/* Address to scan (I2C address of this chip) */		/* Address to scan (I2C address of this chip) */
	static unsigned short normal_i2c[] = {		static unsigned short normal_i2c[] = {
	I2C_TDA7432 >> 1,		I2C_ADDR_TDA7432 >> 1,
	I2C_CLIENT_END,		I2C_CLIENT_END,
	};		};
	I2C_CLIENT_INSMOD;		I2C_CLIENT_INSMOD;

drivers/media/video/tda9840.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -43,7 +43,7 @@ MODULE_PARM_DESC(debug, "Turn on/off device debugging (default:off).");
	#define TEST 0x04		#define TEST 0x04

	/* addresses to scan, found only at 0x42 (7-Bit) */		/* addresses to scan, found only at 0x42 (7-Bit) */
	static unsigned short normal_i2c[] = { I2C_TDA9840, I2C_CLIENT_END };		static unsigned short normal_i2c[] = { I2C_ADDR_TDA9840, I2C_CLIENT_END };

	/* magic definition of all other variables and things */		/* magic definition of all other variables and things */
	I2C_CLIENT_INSMOD;		I2C_CLIENT_INSMOD;