V4L/DVB (9417): DVB_ATTACH for STB0899, STB6100, TDA8261

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 8 insertions, 11 deletions

diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index ae28b0e7ab8d..ec31895c0729 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -1603,8 +1603,8 @@ static void frontend_init(struct budget_av *budget_av)
         case SUBID_DVBS2_KNC1:
         case SUBID_DVBS2_KNC1_OEM:
                 budget_av->reinitialise_demod = 1;
-                if ((fe = stb0899_attach(&knc1_dvbs2_config, &budget_av->budget.i2c_adap)))
-                        tda8261_attach(fe, &sd1878c_config, &budget_av->budget.i2c_adap);
+                if ((fe = dvb_attach(stb0899_attach, &knc1_dvbs2_config, &budget_av->budget.i2c_adap)))
+                        dvb_attach(tda8261_attach, fe, &sd1878c_config, &budget_av->budget.i2c_adap);
 
                 break;
         case SUBID_DVBS_CINERGY1200:
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 169acfae54d2..6b77b123f75c 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -1768,20 +1768,17 @@ static void frontend_init(struct budget_ci *budget_ci)
                 break;
 
         case 0x1019:            // TT S2-3200 PCI
-                budget_ci->budget.dvb_frontend = stb0899_attach(&tt3200_config, &budget_ci->budget.i2c_adap);
+                budget_ci->budget.dvb_frontend = dvb_attach(stb0899_attach, &tt3200_config, &budget_ci->budget.i2c_adap);
                 if (budget_ci->budget.dvb_frontend) {
-                        if (stb6100_attach(budget_ci->budget.dvb_frontend, &tt3200_stb6100_config, &budget_ci->budget.i2c_adap)) {
-                                if (!lnbp21_attach(budget_ci->budget.dvb_frontend, &budget_ci->budget.i2c_adap, 0, 0)) {
+                        if (dvb_attach(stb6100_attach, budget_ci->budget.dvb_frontend, &tt3200_stb6100_config, &budget_ci->budget.i2c_adap)) {
+                                if (!dvb_attach(lnbp21_attach, budget_ci->budget.dvb_frontend, &budget_ci->budget.i2c_adap, 0, 0)) {
                                         printk("%s: No LNBP21 found!\n", __FUNCTION__);
-                                        if (budget_ci->budget.dvb_frontend->ops.tuner_ops.release)
-                                                budget_ci->budget.dvb_frontend->ops.tuner_ops.release(budget_ci->budget.dvb_frontend);
-                                        if (budget_ci->budget.dvb_frontend->ops.release)
-                                                budget_ci->budget.dvb_frontend->ops.release(budget_ci->budget.dvb_frontend);
+                                        dvb_frontend_detach(budget_ci->budget.dvb_frontend);
                                         budget_ci->budget.dvb_frontend = NULL;
                                 }
                         } else {
-                                if (budget_ci->budget.dvb_frontend->ops.release)
-                                        budget_ci->budget.dvb_frontend->ops.release(budget_ci->budget.dvb_frontend);
+                                        dvb_frontend_detach(budget_ci->budget.dvb_frontend);
+                                        budget_ci->budget.dvb_frontend = NULL;
                         }
                 }
                 break;