| Message ID | 50CD03AF.3080602@sfr.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 12/16/2012 01:11 AM, Patrice Chotard wrote: > Previously, demodulator and tuner attach was done in the > demod_attach callback. Migrate the tuner part in the > tuner_attach callback in ngene_info to do thing in right place. > > Signed-off-by: Patrice Chotard <patricechotard@free.fr> > --- > drivers/media/pci/ngene/ngene-cards.c | 10 ++++++++++ > 1 file changed, 10 insertions(+) > > diff --git a/drivers/media/pci/ngene/ngene-cards.c > b/drivers/media/pci/ngene/ngene-cards.c > index 96a13ed..8db3fa1 100644 > --- a/drivers/media/pci/ngene/ngene-cards.c > +++ b/drivers/media/pci/ngene/ngene-cards.c > @@ -328,6 +328,15 @@ static int demod_attach_drxd(struct ngene_channel > *chan) > return -ENODEV; > } > > + return 0; > +} > + > +static int tuner_attach_dtt7520x(struct ngene_channel *chan) > +{ > + struct drxd_config *feconf; > + > + feconf = chan->dev->card_info->fe_config[chan->number]; > + > if (!dvb_attach(dvb_pll_attach, chan->fe, feconf->pll_address, > &chan->i2c_adapter, > feconf->pll_type)) { > @@ -722,6 +731,7 @@ static struct ngene_info ngene_info_terratec = { > .name = "Terratec Integra/Cinergy2400i Dual DVB-T", > .io_type = {NGENE_IO_TSIN, NGENE_IO_TSIN}, > .demod_attach = {demod_attach_drxd, demod_attach_drxd}, > + .tuner_attach = {tuner_attach_dtt7520x, tuner_attach_dtt7520x}, > .fe_config = {&fe_terratec_dvbt_0, &fe_terratec_dvbt_1}, > .i2c_access = 1, > }; > Reviewed-by: Antti Palosaari <crope@iki.fi> Looks very correct, but I am not familiar with n-gene. regards Antti
diff --git a/drivers/media/pci/ngene/ngene-cards.c b/drivers/media/pci/ngene/ngene-cards.c index 96a13ed..8db3fa1 100644 --- a/drivers/media/pci/ngene/ngene-cards.c +++ b/drivers/media/pci/ngene/ngene-cards.c @@ -328,6 +328,15 @@ static int demod_attach_drxd(struct ngene_channel *chan) return -ENODEV; } + return 0; +} + +static int tuner_attach_dtt7520x(struct ngene_channel *chan) +{ + struct drxd_config *feconf; + + feconf = chan->dev->card_info->fe_config[chan->number]; + if (!dvb_attach(dvb_pll_attach, chan->fe, feconf->pll_address, &chan->i2c_adapter,
Previously, demodulator and tuner attach was done in the demod_attach callback. Migrate the tuner part in the tuner_attach callback in ngene_info to do thing in right place. Signed-off-by: Patrice Chotard <patricechotard@free.fr> --- drivers/media/pci/ngene/ngene-cards.c | 10 ++++++++++ 1 file changed, 10 insertions(+) feconf->pll_type)) { @@ -722,6 +731,7 @@ static struct ngene_info ngene_info_terratec = { .name = "Terratec Integra/Cinergy2400i Dual DVB-T", .io_type = {NGENE_IO_TSIN, NGENE_IO_TSIN}, .demod_attach = {demod_attach_drxd, demod_attach_drxd}, + .tuner_attach = {tuner_attach_dtt7520x, tuner_attach_dtt7520x}, .fe_config = {&fe_terratec_dvbt_0, &fe_terratec_dvbt_1}, .i2c_access = 1, };