mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-26 10:49:33 +00:00
Code Issues Releases Wiki Activity

[media] fc0012: use struct for driver config

Browse source 
I need even more configuration options and overloading dvb_attach()
for all those sounds quite stupid. Due to that switch struct and make
room for new options.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Acked-by: Hans-Frieder Vogt <hfvogt@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Antti Palosaari 2012-12-08 23:27:49 -03:00 committed by Mauro Carvalho Chehab
parent bf97b6373b
commit ad3a758bb3
4 changed files with 34 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/media/tuners/fc0012.c
View file

@ -436,8 +436,7 @@ static const struct dvb_tuner_ops fc0012_tuner_ops = {
};
struct dvb_frontend *fc0012_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c, u8 i2c_address, int dual_master,
enum fc001x_xtal_freq xtal_freq)
struct i2c_adapter *i2c, const struct fc0012_config *cfg)
{
struct fc0012_priv *priv = NULL;
@ -446,9 +445,9 @@ struct dvb_frontend *fc0012_attach(struct dvb_frontend *fe,
return NULL;
priv->i2c = i2c;
priv->dual_master = dual_master;
priv->addr = i2c_address;
priv->xtal_freq = xtal_freq;
priv->dual_master = cfg->dual_master;
priv->addr = cfg->i2c_address;
priv->xtal_freq = cfg->xtal_freq;
info("Fitipower FC0012 successfully attached.");

20
drivers/media/tuners/fc0012.h
View file

@ -24,17 +24,29 @@
#include "dvb_frontend.h"
#include "fc001x-common.h"
struct fc0012_config {
/*
* I2C address
*/
u8 i2c_address;
/*
* clock
*/
enum fc001x_xtal_freq xtal_freq;
int dual_master;
};
#if defined(CONFIG_MEDIA_TUNER_FC0012) || \
(defined(CONFIG_MEDIA_TUNER_FC0012_MODULE) && defined(MODULE))
extern struct dvb_frontend *fc0012_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c,
u8 i2c_address, int dual_master,
enum fc001x_xtal_freq xtal_freq);
const struct fc0012_config *cfg);
#else
static inline struct dvb_frontend *fc0012_attach(struct dvb_frontend *fe,
struct i2c_adapter *i2c,
u8 i2c_address, int dual_master,
enum fc001x_xtal_freq xtal_freq)
const struct fc0012_config *cfg)
{
printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
return NULL;

10
drivers/media/usb/dvb-usb-v2/af9035.c
View file

@ -900,6 +900,12 @@ static const struct fc2580_config af9035_fc2580_config = {
.clock = 16384000,
};
static const struct fc0012_config af9035_fc0012_config = {
.i2c_address = 0x63,
.xtal_freq = FC_XTAL_36_MHZ,
.dual_master = 1,
};
static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
{
struct state *state = adap_to_priv(adap);
@ -1043,8 +1049,8 @@ static int af9035_tuner_attach(struct dvb_usb_adapter *adap)
usleep_range(10000, 50000);
fe = dvb_attach(fc0012_attach, adap->fe[0], &d->i2c_adap, 0x63,
1, FC_XTAL_36_MHZ);
fe = dvb_attach(fc0012_attach, adap->fe[0], &d->i2c_adap,
&af9035_fc0012_config);
break;
default:
fe = NULL;

7
drivers/media/usb/dvb-usb-v2/rtl28xxu.c
View file

@ -835,6 +835,11 @@ static struct tua9001_config rtl2832u_tua9001_config = {
.i2c_addr = 0x60,
};
static const struct fc0012_config rtl2832u_fc0012_config = {
.i2c_address = 0x63, /* 0xc6 >> 1 */
.xtal_freq = FC_XTAL_28_8_MHZ,
};
static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap)
{
int ret;
@ -847,7 +852,7 @@ static int rtl2832u_tuner_attach(struct dvb_usb_adapter *adap)
switch (priv->tuner) {
case TUNER_RTL2832_FC0012:
fe = dvb_attach(fc0012_attach, adap->fe[0],
&d->i2c_adap, 0xc6>>1, 0, FC_XTAL_28_8_MHZ);
&d->i2c_adap, &rtl2832u_fc0012_config);
/* since fc0012 includs reading the signal strength delegate
* that to the tuner driver */