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

Commit 78f2c50b authored by Julia Lawall's avatar Julia Lawall Committed by Mauro Carvalho Chehab
Browse files

[media] constify i2c_algorithm structures 

These i2c_algorithm structures are only stored in the alg field of an
i2c_adapter structure, which is declared as const.  This declare the
structures as const as well.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/

)

// <smpl>
@r disable optional_qualifier@
identifier i;
position p;
@@
static struct i2c_algorithm i@p = { ... };

@ok@
identifier r.i;
struct i2c_adapter e;
position p;
@@
e.alg = &i@p;

@bad@
position p != {r.p,ok.p};
identifier r.i;
@@
i@p

@depends on !bad disable optional_qualifier@
identifier r.i;
@@
static
+const
 struct i2c_algorithm i = { ... };
// </smpl>

Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent f3c4a8f8

drivers/media/pci/cx23885/cx23885-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static u32 cx23885_functionality(struct i2c_adapter *adap) 
	return I2C_FUNC_SMBUS_EMUL | I2C_FUNC_I2C;

}



static struct i2c_algorithm cx23885_i2c_algo_template = {

static const struct i2c_algorithm cx23885_i2c_algo_template = {

	.master_xfer	= i2c_xfer,

	.functionality	= cx23885_functionality,

};

drivers/media/pci/cx25821/cx25821-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static u32 cx25821_functionality(struct i2c_adapter *adap) 
		I2C_FUNC_SMBUS_READ_WORD_DATA | I2C_FUNC_SMBUS_WRITE_WORD_DATA;

}



static struct i2c_algorithm cx25821_i2c_algo_template = {

static const struct i2c_algorithm cx25821_i2c_algo_template = {

	.master_xfer = i2c_xfer,

	.functionality = cx25821_functionality,

#ifdef NEED_ALGO_CONTROL

drivers/media/pci/ivtv/ivtv-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static u32 ivtv_functionality(struct i2c_adapter *adap) 
	return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;

}



static struct i2c_algorithm ivtv_algo = {

static const struct i2c_algorithm ivtv_algo = {

	.master_xfer   = ivtv_xfer,

	.functionality = ivtv_functionality,

};

drivers/media/pci/saa7134/saa7134-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static u32 functionality(struct i2c_adapter *adap) 
	return I2C_FUNC_SMBUS_EMUL;

}



static struct i2c_algorithm saa7134_algo = {

static const struct i2c_algorithm saa7134_algo = {

	.master_xfer   = saa7134_i2c_xfer,

	.functionality = functionality,

};

drivers/media/pci/saa7164/saa7164-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static u32 saa7164_functionality(struct i2c_adapter *adap) 
	return I2C_FUNC_I2C;

}



static struct i2c_algorithm saa7164_i2c_algo_template = {

static const struct i2c_algorithm saa7164_i2c_algo_template = {

	.master_xfer	= i2c_xfer,

	.functionality	= saa7164_functionality,

};