Skip to content

Commit

Permalink
[media] tuners: remove dvb_frontend_parameters from set_params()
Browse files Browse the repository at this point in the history 
This is a big patch, yet trivial: now that all tuners use the DVBv5
way to pass parameters (e. g. via fe->dtv_property_cache), the
extra parameter can be removed from set_params() call.

After this change, very few DVBv3 specific stuff are left at the
tuners.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Mauro Carvalho Chehab committed Dec 31, 2011
1 parent 249fa0b commit 14d24d1
Show file tree
Hide file tree
Showing 102 changed files with 148 additions and 186 deletions.
3 changes: 1 addition & 2 deletions drivers/media/common/tuners/max2165.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,8 +257,7 @@ static void max2165_debug_status(struct max2165_priv *priv)
dprintk("VCO: %d, VCO Sub-band: %d, ADC: %d\n", vco, vco_sub_band, adc);
}

static int max2165_set_params(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params)
static int max2165_set_params(struct dvb_frontend *fe)
{
struct max2165_priv *priv = fe->tuner_priv;
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
Expand Down
3 changes: 1 addition & 2 deletions drivers/media/common/tuners/mc44s803.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,8 +214,7 @@ static int mc44s803_init(struct dvb_frontend *fe)
return err;
}

static int mc44s803_set_params(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params)
static int mc44s803_set_params(struct dvb_frontend *fe)
{
struct mc44s803_priv *priv = fe->tuner_priv;
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/common/tuners/mt2060.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ static int mt2060_spurcheck(u32 lo1,u32 lo2,u32 if2)
#define IF2 36150 // IF2 frequency = 36.150 MHz
#define FREF 16000 // Quartz oscillator 16 MHz

static int mt2060_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
static int mt2060_set_params(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct mt2060_priv *priv;
Expand Down
3 changes: 1 addition & 2 deletions drivers/media/common/tuners/mt2131.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ static int mt2131_writeregs(struct mt2131_priv *priv,u8 *buf, u8 len)
return 0;
}

static int mt2131_set_params(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params)
static int mt2131_set_params(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct mt2131_priv *priv;
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/common/tuners/mt2266.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ static u8 mt2266_vhf[] = { 0x1d, 0xfe, 0x00, 0x00, 0xb4, 0x03, 0xa5, 0xa5,

#define FREF 30000 // Quartz oscillator 30 MHz

static int mt2266_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *params)
static int mt2266_set_params(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct mt2266_priv *priv;
Expand Down
3 changes: 1 addition & 2 deletions drivers/media/common/tuners/mxl5005s.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3979,8 +3979,7 @@ static int mxl5005s_AssignTunerMode(struct dvb_frontend *fe, u32 mod_type,
return 0;
}

static int mxl5005s_set_params(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params)
static int mxl5005s_set_params(struct dvb_frontend *fe)
{
struct mxl5005s_state *state = fe->tuner_priv;
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
Expand Down
3 changes: 1 addition & 2 deletions drivers/media/common/tuners/mxl5007t.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -616,8 +616,7 @@ static int mxl5007t_get_status(struct dvb_frontend *fe, u32 *status)

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

static int mxl5007t_set_params(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params)
static int mxl5007t_set_params(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
u32 delsys = c->delivery_system;
Expand Down
6 changes: 2 additions & 4 deletions drivers/media/common/tuners/qt1010.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,7 @@ static void qt1010_dump_regs(struct qt1010_priv *priv)
printk(KERN_CONT "\n");
}

static int qt1010_set_params(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params)
static int qt1010_set_params(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct qt1010_priv *priv;
Expand Down Expand Up @@ -319,7 +318,6 @@ static u8 qt1010_init_meas2(struct qt1010_priv *priv,
static int qt1010_init(struct dvb_frontend *fe)
{
struct qt1010_priv *priv = fe->tuner_priv;
struct dvb_frontend_parameters params;
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
int err = 0;
u8 i, tmpval, *valptr = NULL;
Expand Down Expand Up @@ -399,7 +397,7 @@ static int qt1010_init(struct dvb_frontend *fe)

c->frequency = 545000000; /* Sigmatek DVB-110 545000000 */
/* MSI Megasky 580 GL861 533000000 */
return qt1010_set_params(fe, &params);
return qt1010_set_params(fe);
}

static int qt1010_release(struct dvb_frontend *fe)
Expand Down
3 changes: 1 addition & 2 deletions drivers/media/common/tuners/tda18212.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,7 @@ static void tda18212_dump_regs(struct tda18212_priv *priv)
}
#endif

static int tda18212_set_params(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p)
static int tda18212_set_params(struct dvb_frontend *fe)
{
struct tda18212_priv *priv = fe->tuner_priv;
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
Expand Down
3 changes: 1 addition & 2 deletions drivers/media/common/tuners/tda18218.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,7 @@ static int tda18218_rd_reg(struct tda18218_priv *priv, u8 reg, u8 *val)
return tda18218_rd_regs(priv, reg, val, 1);
}

static int tda18218_set_params(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params)
static int tda18218_set_params(struct dvb_frontend *fe)
{
struct tda18218_priv *priv = fe->tuner_priv;
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
Expand Down
3 changes: 1 addition & 2 deletions drivers/media/common/tuners/tda18271-fe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -928,8 +928,7 @@ static int tda18271_tune(struct dvb_frontend *fe,

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

static int tda18271_set_params(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params)
static int tda18271_set_params(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
u32 delsys = c->delivery_system;
Expand Down
6 changes: 2 additions & 4 deletions drivers/media/common/tuners/tda827x.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,7 @@ static int tuner_transfer(struct dvb_frontend *fe,
return rc;
}

static int tda827xo_set_params(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params)
static int tda827xo_set_params(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct tda827x_priv *priv = fe->tuner_priv;
Expand Down Expand Up @@ -517,8 +516,7 @@ static void tda827xa_lna_gain(struct dvb_frontend *fe, int high,
}
}

static int tda827xa_set_params(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params)
static int tda827xa_set_params(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct tda827x_priv *priv = fe->tuner_priv;
Expand Down
3 changes: 1 addition & 2 deletions drivers/media/common/tuners/tuner-simple.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -907,8 +907,7 @@ static int simple_dvb_calc_regs(struct dvb_frontend *fe,
return 5;
}

static int simple_dvb_set_params(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params)
static int simple_dvb_set_params(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
u32 delsys = c->delivery_system;
Expand Down
3 changes: 1 addition & 2 deletions drivers/media/common/tuners/tuner-xc2028.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1084,8 +1084,7 @@ static int xc2028_set_analog_freq(struct dvb_frontend *fe,
V4L2_TUNER_ANALOG_TV, type, p->std, 0);
}

static int xc2028_set_params(struct dvb_frontend *fe,
struct dvb_frontend_parameters *p)
static int xc2028_set_params(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
u32 delsys = c->delivery_system;
Expand Down
3 changes: 1 addition & 2 deletions drivers/media/common/tuners/xc4000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1121,8 +1121,7 @@ static void xc_debug_dump(struct xc4000_priv *priv)
dprintk(1, "*** Quality (0:<8dB, 7:>56dB) = %d\n", quality);
}

static int xc4000_set_params(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params)
static int xc4000_set_params(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
u32 delsys = c->delivery_system;
Expand Down
3 changes: 1 addition & 2 deletions drivers/media/common/tuners/xc5000.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,8 +628,7 @@ static void xc_debug_dump(struct xc5000_priv *priv)
dprintk(1, "*** Quality (0:<8dB, 7:>56dB) = %d\n", quality);
}

static int xc5000_set_params(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params)
static int xc5000_set_params(struct dvb_frontend *fe)
{
int ret, b;
struct xc5000_priv *priv = fe->tuner_priv;
Expand Down
6 changes: 3 additions & 3 deletions drivers/media/dvb/bt8xx/dvb-bt8xx.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ static struct zl10353_config thomson_dtt7579_zl10353_config = {
.demod_address = 0x0f,
};

static int cx24108_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
static int cx24108_tuner_set_params(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
u32 freq = c->frequency;
Expand Down Expand Up @@ -267,7 +267,7 @@ static struct cx24110_config pctvsat_config = {
.demod_address = 0x55,
};

static int microtune_mt7202dtf_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
static int microtune_mt7202dtf_tuner_set_params(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe->dvb->priv;
Expand Down Expand Up @@ -463,7 +463,7 @@ static struct or51211_config or51211_config = {
.sleep = or51211_sleep,
};

static int vp3021_alps_tded4_tuner_set_params(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
static int vp3021_alps_tded4_tuner_set_params(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe->dvb->priv;
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/dvb-core/dvb_frontend.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ struct dvb_tuner_ops {
int (*sleep)(struct dvb_frontend *fe);

/** This is for simple PLLs - set all parameters in one go. */
int (*set_params)(struct dvb_frontend *fe, struct dvb_frontend_parameters *p);
int (*set_params)(struct dvb_frontend *fe);
int (*set_analog_params)(struct dvb_frontend *fe, struct analog_parameters *p);

/** This is support for demods like the mt352 - fills out the supplied buffer with what to write. */
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/dvb-usb/af9005-fe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1189,7 +1189,7 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe,
return ret;
/* set tuner */
deb_info("set tuner\n");
ret = fe->ops.tuner_ops.set_params(fe, fep);
ret = fe->ops.tuner_ops.set_params(fe);
if (ret)
return ret;

Expand Down
8 changes: 3 additions & 5 deletions drivers/media/dvb/dvb-usb/cxusb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1067,12 +1067,10 @@ static struct dib0070_config dib7070p_dib0070_config = {
};

struct dib0700_adapter_state {
int (*set_param_save) (struct dvb_frontend *,
struct dvb_frontend_parameters *);
int (*set_param_save) (struct dvb_frontend *);
};

static int dib7070_set_param_override(struct dvb_frontend *fe,
struct dvb_frontend_parameters *fep)
static int dib7070_set_param_override(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
struct dvb_usb_adapter *adap = fe->dvb->priv;
Expand All @@ -1088,7 +1086,7 @@ static int dib7070_set_param_override(struct dvb_frontend *fe,

dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe));

return state->set_param_save(fe, fep);
return state->set_param_save(fe);
}

static int cxusb_dualdig4_rev2_tuner_attach(struct dvb_usb_adapter *adap)
Expand Down
30 changes: 13 additions & 17 deletions drivers/media/dvb/dvb-usb/dib0700_devices.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ MODULE_PARM_DESC(force_lna_activation, "force the activation of Low-Noise-Amplif
"if applicable for the device (default: 0=automatic/off).");

struct dib0700_adapter_state {
int (*set_param_save) (struct dvb_frontend *, struct dvb_frontend_parameters *);
int (*set_param_save) (struct dvb_frontend *);
const struct firmware *frontend_firmware;
};

Expand Down Expand Up @@ -804,7 +804,7 @@ static struct dib0070_config dib7770p_dib0070_config = {
.charge_pump = 2,
};

static int dib7070_set_param_override(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
static int dib7070_set_param_override(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
struct dvb_usb_adapter *adap = fe->dvb->priv;
Expand All @@ -819,11 +819,10 @@ static int dib7070_set_param_override(struct dvb_frontend *fe, struct dvb_fronte
}
deb_info("WBD for DiB7000P: %d\n", offset + dib0070_wbd_offset(fe));
dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe));
return state->set_param_save(fe, fep);
return state->set_param_save(fe);
}

static int dib7770_set_param_override(struct dvb_frontend *fe,
struct dvb_frontend_parameters *fep)
static int dib7770_set_param_override(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
struct dvb_usb_adapter *adap = fe->dvb->priv;
Expand All @@ -844,7 +843,7 @@ static int dib7770_set_param_override(struct dvb_frontend *fe,
}
deb_info("WBD for DiB7000P: %d\n", offset + dib0070_wbd_offset(fe));
dib7000p_set_wbd_ref(fe, offset + dib0070_wbd_offset(fe));
return state->set_param_save(fe, fep);
return state->set_param_save(fe);
}

static int dib7770p_tuner_attach(struct dvb_usb_adapter *adap)
Expand Down Expand Up @@ -1207,8 +1206,7 @@ static struct dib0070_config dib807x_dib0070_config[2] = {
}
};

static int dib807x_set_param_override(struct dvb_frontend *fe,
struct dvb_frontend_parameters *fep)
static int dib807x_set_param_override(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
struct dvb_usb_adapter *adap = fe->dvb->priv;
Expand All @@ -1227,7 +1225,7 @@ static int dib807x_set_param_override(struct dvb_frontend *fe,
deb_info("WBD for DiB8000: %d\n", offset);
dib8000_set_wbd_ref(fe, offset);

return state->set_param_save(fe, fep);
return state->set_param_save(fe);
}

static int dib807x_tuner_attach(struct dvb_usb_adapter *adap)
Expand Down Expand Up @@ -1506,8 +1504,7 @@ static struct dib0090_config dib809x_dib0090_config = {
.fref_clock_ratio = 6,
};

static int dib8096_set_param_override(struct dvb_frontend *fe,
struct dvb_frontend_parameters *fep)
static int dib8096_set_param_override(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
struct dvb_usb_adapter *adap = fe->dvb->priv;
Expand All @@ -1518,7 +1515,7 @@ static int dib8096_set_param_override(struct dvb_frontend *fe,
enum frontend_tune_state tune_state = CT_SHUTDOWN;
u16 ltgain, rf_gain_limit;

ret = state->set_param_save(fe, fep);
ret = state->set_param_save(fe);
if (ret < 0)
return ret;

Expand Down Expand Up @@ -1823,8 +1820,7 @@ struct dibx090p_adc dib8090p_adc_tab[] = {
{0xffffffff, 0, 0, 0}, /* 60 MHz */
};

static int dib8096p_agc_startup(struct dvb_frontend *fe,
struct dvb_frontend_parameters *fep)
static int dib8096p_agc_startup(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
struct dvb_usb_adapter *adap = fe->dvb->priv;
Expand All @@ -1834,7 +1830,7 @@ static int dib8096p_agc_startup(struct dvb_frontend *fe,
int better_sampling_freq = 0, ret;
struct dibx090p_adc *adc_table = &dib8090p_adc_tab[0];

ret = state->set_param_save(fe, fep);
ret = state->set_param_save(fe);
if (ret < 0)
return ret;
memset(&pll, 0, sizeof(struct dibx000_bandwidth_config));
Expand Down Expand Up @@ -2325,7 +2321,7 @@ static int dib7090p_get_best_sampling(struct dvb_frontend *fe , struct dib7090p_
return 0;
}

static int dib7090_agc_startup(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
static int dib7090_agc_startup(struct dvb_frontend *fe)
{
struct dvb_usb_adapter *adap = fe->dvb->priv;
struct dib0700_adapter_state *state = adap->priv;
Expand All @@ -2334,7 +2330,7 @@ static int dib7090_agc_startup(struct dvb_frontend *fe, struct dvb_frontend_para
struct dib7090p_best_adc adc;
int ret;

ret = state->set_param_save(fe, fep);
ret = state->set_param_save(fe);
if (ret < 0)
return ret;

Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/dvb-usb/digitv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ static struct mt352_config digitv_mt352_config = {
.demod_init = digitv_mt352_demod_init,
};

static int digitv_nxt6000_tuner_set_params(struct dvb_frontend *fe, struct dvb_frontend_parameters *fep)
static int digitv_nxt6000_tuner_set_params(struct dvb_frontend *fe)
{
struct dvb_usb_adapter *adap = fe->dvb->priv;
u8 b[5];
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/dvb/dvb-usb/mxl111sf-demod.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ static int mxl111sf_demod_set_frontend(struct dvb_frontend *fe,
mxl_dbg("()");

if (fe->ops.tuner_ops.set_params) {
ret = fe->ops.tuner_ops.set_params(fe, param);
ret = fe->ops.tuner_ops.set_params(fe);
if (mxl_fail(ret))
goto fail;
msleep(50);
Expand Down
3 changes: 1 addition & 2 deletions drivers/media/dvb/dvb-usb/mxl111sf-tuner.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,7 @@ static int mxl1x1sf_tuner_loop_thru_ctrl(struct mxl111sf_tuner_state *state,

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

static int mxl111sf_tuner_set_params(struct dvb_frontend *fe,
struct dvb_frontend_parameters *params)
static int mxl111sf_tuner_set_params(struct dvb_frontend *fe)
{
struct dtv_frontend_properties *c = &fe->dtv_property_cache;
u32 delsys = c->delivery_system;
Expand Down
Loading

0 comments on commit 14d24d1

Please sign in to comment.