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

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

V4L/DVB (12343): Stop defining I2C adapter IDs nobody uses 



There is no point in defining I2C adapter IDs when no code is using
them. As this field might go away in the future, stop using it when
we don't need to.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 43f8de7a

drivers/media/video/au0828/au0828-i2c.c

+0 −1
Original line number Diff line number Diff line
@@ -320,7 +320,6 @@ static struct i2c_algorithm au0828_i2c_algo_template = { 
static struct i2c_adapter au0828_i2c_adap_template = {

	.name              = DRIVER_NAME,

	.owner             = THIS_MODULE,

	.id                = I2C_HW_B_AU0828,

	.algo              = &au0828_i2c_algo_template,

};

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

+0 −2
Original line number Diff line number Diff line
@@ -352,7 +352,6 @@ int __devinit init_bttv_i2c(struct bttv *btv) 
		/* bt878 */

		strlcpy(btv->c.i2c_adap.name, "bt878",

			sizeof(btv->c.i2c_adap.name));

		btv->c.i2c_adap.id = I2C_HW_B_BT848;	/* FIXME */

		btv->c.i2c_adap.algo = &bttv_algo;

	} else {

		/* bt848 */
@@ -362,7 +361,6 @@ int __devinit init_bttv_i2c(struct bttv *btv) 


		strlcpy(btv->c.i2c_adap.name, "bttv",

			sizeof(btv->c.i2c_adap.name));

		btv->c.i2c_adap.id = I2C_HW_B_BT848;

		memcpy(&btv->i2c_algo, &bttv_i2c_algo_bit_template,

		       sizeof(bttv_i2c_algo_bit_template));

		btv->i2c_algo.udelay = i2c_udelay;

drivers/media/video/cafe_ccic.c

+0 −1
Original line number Diff line number Diff line
@@ -490,7 +490,6 @@ static int cafe_smbus_setup(struct cafe_camera *cam) 
	int ret;



	cafe_smbus_enable_irq(cam);

	adap->id = I2C_HW_SMBUS_CAFE;

	adap->owner = THIS_MODULE;

	adap->algo = &cafe_smbus_algo;

	strcpy(adap->name, "cafe_ccic");

drivers/media/video/cx18/cx18-i2c.c

+0 −1
Original line number Diff line number Diff line
@@ -190,7 +190,6 @@ static int cx18_getsda(void *data) 
/* template for i2c-bit-algo */

static struct i2c_adapter cx18_i2c_adap_template = {

	.name = "cx18 i2c driver",

	.id = I2C_HW_B_CX2341X,

	.algo = NULL,                   /* set by i2c-algo-bit */

	.algo_data = NULL,              /* filled from template */

	.owner = THIS_MODULE,

drivers/media/video/cx231xx/cx231xx-i2c.c

+0 −1
Original line number Diff line number Diff line
@@ -432,7 +432,6 @@ static struct i2c_algorithm cx231xx_algo = { 
static struct i2c_adapter cx231xx_adap_template = {

	.owner = THIS_MODULE,

	.name = "cx231xx",

	.id = I2C_HW_B_CX231XX,

	.algo = &cx231xx_algo,

};