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

Commit e4671b6b authored by Matthias Schwarzott's avatar Matthias Schwarzott Committed by Mauro Carvalho Chehab
Browse files

V4L/DVB (7861): mt312: Prefix functions only with mt312_, Add zl10313 to kconfig description 



This patch does some small cleanup to mt312.
It changes kconfig description to also list the ZL10313.

It does change some strange symbol names to be consistent with
module name mt312 and naming of all other functions in there.
* vp310_mt312_ops -> mt312_ops
* vp310_mt312_attach -> mt312_attach

Adds a MODULE_AUTHOR for me

Signed-off-by: default avatarMatthias Schwarzott <zzam@gentoo.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 6d8425b1

drivers/media/dvb/b2c2/flexcop-fe-tuner.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -634,7 +634,7 @@ int flexcop_frontend_init(struct flexcop_device *fc) 
	}

	}





	/* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */

	/* try the sky v2.3 (vp310/Samsung tbdu18132(tsa5059)) */

	fc->fe = dvb_attach(vp310_mt312_attach,

	fc->fe = dvb_attach(mt312_attach,

		&skystar23_samsung_tbdu18132_config, i2c);

		&skystar23_samsung_tbdu18132_config, i2c);

	if (fc->fe != NULL) {

	if (fc->fe != NULL) {

		ops = &fc->fe->ops;

		ops = &fc->fe->ops;

drivers/media/dvb/frontends/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ config DVB_CX24123 
	  A DVB-S tuner module. Say Y when you want to support this frontend.

	  A DVB-S tuner module. Say Y when you want to support this frontend.





config DVB_MT312

config DVB_MT312

	tristate "Zarlink VP310/MT312 based"

	tristate "Zarlink VP310/MT312/ZL10313 based"

	depends on DVB_CORE && I2C

	depends on DVB_CORE && I2C

	default m if DVB_FE_CUSTOMISE

	default m if DVB_FE_CUSTOMISE

	help

	help

drivers/media/dvb/frontends/mt312.c

+5 −4
Original line number Original line Diff line number Diff line
@@ -737,7 +737,7 @@ static void mt312_release(struct dvb_frontend *fe) 
}

}





#define MT312_SYS_CLK		90000000UL	/* 90 MHz */

#define MT312_SYS_CLK		90000000UL	/* 90 MHz */

static struct dvb_frontend_ops vp310_mt312_ops = {

static struct dvb_frontend_ops mt312_ops = {





	.info = {

	.info = {

		.name = "Zarlink ???? DVB-S",

		.name = "Zarlink ???? DVB-S",
@@ -776,7 +776,7 @@ static struct dvb_frontend_ops vp310_mt312_ops = { 
	.set_voltage = mt312_set_voltage,

	.set_voltage = mt312_set_voltage,

};

};





struct dvb_frontend *vp310_mt312_attach(const struct mt312_config *config,

struct dvb_frontend *mt312_attach(const struct mt312_config *config,

					struct i2c_adapter *i2c)

					struct i2c_adapter *i2c)

{

{

	struct mt312_state *state = NULL;

	struct mt312_state *state = NULL;
@@ -795,7 +795,7 @@ struct dvb_frontend *vp310_mt312_attach(const struct mt312_config *config, 
		goto error;

		goto error;





	/* create dvb_frontend */

	/* create dvb_frontend */

	memcpy(&state->frontend.ops, &vp310_mt312_ops,

	memcpy(&state->frontend.ops, &mt312_ops,

		sizeof(struct dvb_frontend_ops));

		sizeof(struct dvb_frontend_ops));

	state->frontend.demodulator_priv = state;

	state->frontend.demodulator_priv = state;
@@ -827,12 +827,13 @@ error: 
	kfree(state);

	kfree(state);

	return NULL;

	return NULL;

}

}

EXPORT_SYMBOL(vp310_mt312_attach);

EXPORT_SYMBOL(mt312_attach);





module_param(debug, int, 0644);

module_param(debug, int, 0644);

MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");

MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");





MODULE_DESCRIPTION("Zarlink VP310/MT312/ZL10313 DVB-S Demodulator driver");

MODULE_DESCRIPTION("Zarlink VP310/MT312/ZL10313 DVB-S Demodulator driver");

MODULE_AUTHOR("Andreas Oberritter <obi@linuxtv.org>");

MODULE_AUTHOR("Andreas Oberritter <obi@linuxtv.org>");

MODULE_AUTHOR("Matthias Schwarzott <zzam@gentoo.org>");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

drivers/media/dvb/frontends/mt312.h

+2 −2
Original line number Original line Diff line number Diff line
@@ -37,10 +37,10 @@ struct mt312_config { 
};

};





#if defined(CONFIG_DVB_MT312) || (defined(CONFIG_DVB_MT312_MODULE) && defined(MODULE))

#if defined(CONFIG_DVB_MT312) || (defined(CONFIG_DVB_MT312_MODULE) && defined(MODULE))

struct dvb_frontend *vp310_mt312_attach(const struct mt312_config *config,

struct dvb_frontend *mt312_attach(const struct mt312_config *config,

					struct i2c_adapter *i2c);

					struct i2c_adapter *i2c);

#else

#else

static inline struct dvb_frontend *vp310_mt312_attach(

static inline struct dvb_frontend *mt312_attach(

	const struct mt312_config *config, struct i2c_adapter *i2c)

	const struct mt312_config *config, struct i2c_adapter *i2c)

{

{

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);

	printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);