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

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

V4L/DVB (5815): Cx88: i2c structure templates clean-up 



Clean up the use of structure templates in cx88-i2c and cx88-vp3054-i2c.
For one thing, a real template is supposed to be read-only. And in some
cases it's more efficient to initialize the few fields we need
individually.

This clean-up shrinks cx88-i2c.o by 33% and cx88-vp3054-i2c.o by 49%
(x86_64).

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 4de7bb44

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

+7 −18
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ void cx88_call_i2c_clients(struct cx88_core *core, unsigned int cmd, void *arg) 
		i2c_clients_command(&core->i2c_adap, cmd, arg);

}



static struct i2c_algo_bit_data cx8800_i2c_algo_template = {

static const struct i2c_algo_bit_data cx8800_i2c_algo_template = {

	.setsda  = cx8800_bit_setsda,

	.setscl  = cx8800_bit_setscl,

	.getsda  = cx8800_bit_getsda,
@@ -171,18 +171,6 @@ static struct i2c_algo_bit_data cx8800_i2c_algo_template = { 


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



static struct i2c_adapter cx8800_i2c_adap_template = {

	.name              = "cx2388x",

	.owner             = THIS_MODULE,

	.id                = I2C_HW_B_CX2388x,

	.client_register   = attach_inform,

	.client_unregister = detach_inform,

};



static struct i2c_client cx8800_i2c_client_template = {

	.name	= "cx88xx internal",

};



static char *i2c_devs[128] = {

	[ 0x1c >> 1 ] = "lgdt330x",

	[ 0x86 >> 1 ] = "tda9887/cx22702",
@@ -212,14 +200,9 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci) 
	/* Prevents usage of invalid delay values */

	if (i2c_udelay<5)

		i2c_udelay=5;

	cx8800_i2c_algo_template.udelay=i2c_udelay;



	memcpy(&core->i2c_adap, &cx8800_i2c_adap_template,

	       sizeof(core->i2c_adap));

	memcpy(&core->i2c_algo, &cx8800_i2c_algo_template,

	       sizeof(core->i2c_algo));

	memcpy(&core->i2c_client, &cx8800_i2c_client_template,

	       sizeof(core->i2c_client));



	if (core->tuner_type != TUNER_ABSENT)

		core->i2c_adap.class |= I2C_CLASS_TV_ANALOG;
@@ -228,10 +211,16 @@ int cx88_i2c_init(struct cx88_core *core, struct pci_dev *pci) 


	core->i2c_adap.dev.parent = &pci->dev;

	strlcpy(core->i2c_adap.name,core->name,sizeof(core->i2c_adap.name));

	core->i2c_adap.owner = THIS_MODULE;

	core->i2c_adap.id = I2C_HW_B_CX2388x;

	core->i2c_adap.client_register = attach_inform;

	core->i2c_adap.client_unregister = detach_inform;

	core->i2c_algo.udelay = i2c_udelay;

	core->i2c_algo.data = core;

	i2c_set_adapdata(&core->i2c_adap,core);

	core->i2c_adap.algo_data = &core->i2c_algo;

	core->i2c_client.adapter = &core->i2c_adap;

	strlcpy(core->i2c_client.name, "cx88xx internal", I2C_NAME_SIZE);



	cx8800_bit_setscl(core,1);

	cx8800_bit_setsda(core,1);

drivers/media/video/cx88/cx88-vp3054-i2c.c

+3 −9
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static int vp3054_bit_getsda(void *data) 


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



static struct i2c_algo_bit_data vp3054_i2c_algo_template = {

static const struct i2c_algo_bit_data vp3054_i2c_algo_template = {

	.setsda  = vp3054_bit_setsda,

	.setscl  = vp3054_bit_setscl,

	.getsda  = vp3054_bit_getsda,
@@ -105,12 +105,6 @@ static struct i2c_algo_bit_data vp3054_i2c_algo_template = { 


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



static struct i2c_adapter vp3054_i2c_adap_template = {

	.name              = "cx2388x",

	.owner             = THIS_MODULE,

	.id                = I2C_HW_B_CX2388x,

};



int vp3054_i2c_probe(struct cx8802_dev *dev)

{

	struct cx88_core *core = dev->core;
@@ -125,8 +119,6 @@ int vp3054_i2c_probe(struct cx8802_dev *dev) 
		return -ENOMEM;

	vp3054_i2c = dev->card_priv;



	memcpy(&vp3054_i2c->adap, &vp3054_i2c_adap_template,

	       sizeof(vp3054_i2c->adap));

	memcpy(&vp3054_i2c->algo, &vp3054_i2c_algo_template,

	       sizeof(vp3054_i2c->algo));
@@ -135,6 +127,8 @@ int vp3054_i2c_probe(struct cx8802_dev *dev) 
	vp3054_i2c->adap.dev.parent = &dev->pci->dev;

	strlcpy(vp3054_i2c->adap.name, core->name,

		sizeof(vp3054_i2c->adap.name));

	vp3054_i2c->adap.owner = THIS_MODULE;

	vp3054_i2c->adap.id = I2C_HW_B_CX2388x;

	vp3054_i2c->algo.data = dev;

	i2c_set_adapdata(&vp3054_i2c->adap, dev);

	vp3054_i2c->adap.algo_data = &vp3054_i2c->algo;