Commit 242c5033 authored by Julia Lawall's avatar Julia Lawall Committed by Mauro Carvalho Chehab

[media] constify stv6110x_devctl structure

The stv6110x_devctl structure is never modified, so declare it as
const.

Done with the help of Coccinelle.
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@osg.samsung.com>
parent 37ecc7b1
...@@ -355,7 +355,7 @@ static struct dvb_tuner_ops stv6110x_ops = { ...@@ -355,7 +355,7 @@ static struct dvb_tuner_ops stv6110x_ops = {
.release = stv6110x_release .release = stv6110x_release
}; };
static struct stv6110x_devctl stv6110x_ctl = { static const struct stv6110x_devctl stv6110x_ctl = {
.tuner_init = stv6110x_init, .tuner_init = stv6110x_init,
.tuner_sleep = stv6110x_sleep, .tuner_sleep = stv6110x_sleep,
.tuner_set_mode = stv6110x_set_mode, .tuner_set_mode = stv6110x_set_mode,
...@@ -369,7 +369,7 @@ static struct stv6110x_devctl stv6110x_ctl = { ...@@ -369,7 +369,7 @@ static struct stv6110x_devctl stv6110x_ctl = {
.tuner_get_status = stv6110x_get_status, .tuner_get_status = stv6110x_get_status,
}; };
struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe, const struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
const struct stv6110x_config *config, const struct stv6110x_config *config,
struct i2c_adapter *i2c) struct i2c_adapter *i2c)
{ {
......
...@@ -55,12 +55,12 @@ struct stv6110x_devctl { ...@@ -55,12 +55,12 @@ struct stv6110x_devctl {
#if IS_REACHABLE(CONFIG_DVB_STV6110x) #if IS_REACHABLE(CONFIG_DVB_STV6110x)
extern struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe, extern const struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
const struct stv6110x_config *config, const struct stv6110x_config *config,
struct i2c_adapter *i2c); struct i2c_adapter *i2c);
#else #else
static inline struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe, static inline const struct stv6110x_devctl *stv6110x_attach(struct dvb_frontend *fe,
const struct stv6110x_config *config, const struct stv6110x_config *config,
struct i2c_adapter *i2c) struct i2c_adapter *i2c)
{ {
......
...@@ -70,7 +70,7 @@ struct stv6110x_state { ...@@ -70,7 +70,7 @@ struct stv6110x_state {
const struct stv6110x_config *config; const struct stv6110x_config *config;
u8 regs[8]; u8 regs[8];
struct stv6110x_devctl *devctl; const struct stv6110x_devctl *devctl;
}; };
#endif /* __STV6110x_PRIV_H */ #endif /* __STV6110x_PRIV_H */
...@@ -690,7 +690,7 @@ static int tuner_attach_stv6110(struct ddb_input *input, int type) ...@@ -690,7 +690,7 @@ static int tuner_attach_stv6110(struct ddb_input *input, int type)
struct stv090x_config *feconf = type ? &stv0900_aa : &stv0900; struct stv090x_config *feconf = type ? &stv0900_aa : &stv0900;
struct stv6110x_config *tunerconf = (input->nr & 1) ? struct stv6110x_config *tunerconf = (input->nr & 1) ?
&stv6110b : &stv6110a; &stv6110b : &stv6110a;
struct stv6110x_devctl *ctl; const struct stv6110x_devctl *ctl;
ctl = dvb_attach(stv6110x_attach, input->fe, tunerconf, i2c); ctl = dvb_attach(stv6110x_attach, input->fe, tunerconf, i2c);
if (!ctl) { if (!ctl) {
......
...@@ -57,7 +57,7 @@ static int tuner_attach_stv6110(struct ngene_channel *chan) ...@@ -57,7 +57,7 @@ static int tuner_attach_stv6110(struct ngene_channel *chan)
chan->dev->card_info->fe_config[chan->number]; chan->dev->card_info->fe_config[chan->number];
struct stv6110x_config *tunerconf = (struct stv6110x_config *) struct stv6110x_config *tunerconf = (struct stv6110x_config *)
chan->dev->card_info->tuner_config[chan->number]; chan->dev->card_info->tuner_config[chan->number];
struct stv6110x_devctl *ctl; const struct stv6110x_devctl *ctl;
/* tuner 1+2: i2c adapter #0, tuner 3+4: i2c adapter #1 */ /* tuner 1+2: i2c adapter #0, tuner 3+4: i2c adapter #1 */
if (chan->number < 2) if (chan->number < 2)
......
...@@ -644,7 +644,7 @@ static void frontend_init(struct budget *budget) ...@@ -644,7 +644,7 @@ static void frontend_init(struct budget *budget)
} }
case 0x101c: { /* TT S2-1600 */ case 0x101c: { /* TT S2-1600 */
struct stv6110x_devctl *ctl; const struct stv6110x_devctl *ctl;
saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTLO); saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTLO);
msleep(50); msleep(50);
saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTHI); saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTHI);
...@@ -697,7 +697,7 @@ static void frontend_init(struct budget *budget) ...@@ -697,7 +697,7 @@ static void frontend_init(struct budget *budget)
break; break;
case 0x1020: { /* Omicom S2 */ case 0x1020: { /* Omicom S2 */
struct stv6110x_devctl *ctl; const struct stv6110x_devctl *ctl;
saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTLO); saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTLO);
msleep(50); msleep(50);
saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTHI); saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTHI);
......
...@@ -118,7 +118,7 @@ int c8sectpfe_frontend_attach(struct dvb_frontend **fe, ...@@ -118,7 +118,7 @@ int c8sectpfe_frontend_attach(struct dvb_frontend **fe,
struct channel_info *tsin, int chan_num) struct channel_info *tsin, int chan_num)
{ {
struct tda18212_config *tda18212; struct tda18212_config *tda18212;
struct stv6110x_devctl *fe2; const struct stv6110x_devctl *fe2;
struct i2c_client *client; struct i2c_client *client;
struct i2c_board_info tda18212_info = { struct i2c_board_info tda18212_info = {
.type = "tda18212", .type = "tda18212",
......
...@@ -512,7 +512,7 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a) ...@@ -512,7 +512,7 @@ static int technisat_usb2_frontend_attach(struct dvb_usb_adapter *a)
&a->dev->i2c_adap, STV090x_DEMODULATOR_0); &a->dev->i2c_adap, STV090x_DEMODULATOR_0);
if (a->fe_adap[0].fe) { if (a->fe_adap[0].fe) {
struct stv6110x_devctl *ctl; const struct stv6110x_devctl *ctl;
ctl = dvb_attach(stv6110x_attach, ctl = dvb_attach(stv6110x_attach,
a->fe_adap[0].fe, a->fe_adap[0].fe,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment