V4L/DVB (4386): Convert DVB devices to use dvb_attach()

Only devices using > 1 frontend were ported; ones which did not are left
using static binding.

Signed-off-by: Andrew de Quincey <adq_dvb@lidskialf.net>
Acked-by: Michael Krufky <mkrufky@linuxtv.org>
Acked-by: Trent Piepho <xyzzy@speakeasy.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

3 files changed, 58 insertions, 52 deletions

diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index afde3789d702..6afa3fba1f4f 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -537,10 +537,10 @@ static int dvb_register(struct cx8802_dev *dev)
         switch (dev->core->board) {
 #ifdef HAVE_CX22702
         case CX88_BOARD_HAUPPAUGE_DVB_T1:
-                dev->dvb.frontend = cx22702_attach(&hauppauge_novat_config,
+                dev->dvb.frontend = dvb_attach(cx22702_attach, &hauppauge_novat_config,
                                                    &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_pll_attach(dev->dvb.frontend, 0x61,
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                        &dev->core->i2c_adap,
                                        &dvb_pll_thomson_dtt759x);
                 }
@@ -549,10 +549,10 @@ static int dvb_register(struct cx8802_dev *dev)
         case CX88_BOARD_CONEXANT_DVB_T1:
         case CX88_BOARD_KWORLD_DVB_T_CX22702:
         case CX88_BOARD_WINFAST_DTV1000:
-                dev->dvb.frontend = cx22702_attach(&connexant_refboard_config,
+                dev->dvb.frontend = dvb_attach(cx22702_attach, &connexant_refboard_config,
                                                    &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_pll_attach(dev->dvb.frontend, 0x60,
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
                                        &dev->core->i2c_adap,
                                        &dvb_pll_thomson_dtt7579);
                 }
@@ -560,10 +560,10 @@ static int dvb_register(struct cx8802_dev *dev)
         case CX88_BOARD_WINFAST_DTV2000H:
         case CX88_BOARD_HAUPPAUGE_HVR1100:
         case CX88_BOARD_HAUPPAUGE_HVR1100LP:
-                dev->dvb.frontend = cx22702_attach(&hauppauge_hvr1100_config,
+                dev->dvb.frontend = dvb_attach(cx22702_attach, &hauppauge_hvr1100_config,
                                                    &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_pll_attach(dev->dvb.frontend, 0x61,
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                        &dev->core->i2c_adap,
                                        &dvb_pll_fmd1216me);
                 }
@@ -572,10 +572,10 @@ static int dvb_register(struct cx8802_dev *dev)
 #if defined(HAVE_MT352) || defined(HAVE_ZL10353)
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_PLUS:
 #ifdef HAVE_MT352
-                dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv,
+                dev->dvb.frontend = dvb_attach(mt352_attach, &dvico_fusionhdtv,
                                                  &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_pll_attach(dev->dvb.frontend, 0x60,
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
                                        &dev->core->i2c_adap,
                                        &dvb_pll_thomson_dtt7579);
                         break;
@@ -583,10 +583,10 @@ static int dvb_register(struct cx8802_dev *dev)
 #endif
 #ifdef HAVE_ZL10353
                 /* ZL10353 replaces MT352 on later cards */
-                dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_plus_v1_1,
+                dev->dvb.frontend = dvb_attach(zl10353_attach, &dvico_fusionhdtv_plus_v1_1,
                                                    &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_pll_attach(dev->dvb.frontend, 0x60,
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x60,
                                        &dev->core->i2c_adap,
                                        &dvb_pll_thomson_dtt7579);
                 }
@@ -596,10 +596,10 @@ static int dvb_register(struct cx8802_dev *dev)
 #ifdef HAVE_MT352
                 /* The tin box says DEE1601, but it seems to be DTT7579
                  * compatible, with a slightly different MT352 AGC gain. */
-                dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv_dual,
+                dev->dvb.frontend = dvb_attach(mt352_attach, &dvico_fusionhdtv_dual,
                                                  &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_pll_attach(dev->dvb.frontend, 0x61,
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                        &dev->core->i2c_adap,
                                        &dvb_pll_thomson_dtt7579);
                         break;
@@ -607,10 +607,10 @@ static int dvb_register(struct cx8802_dev *dev)
 #endif
 #ifdef HAVE_ZL10353
                 /* ZL10353 replaces MT352 on later cards */
-                dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_plus_v1_1,
+                dev->dvb.frontend = dvb_attach(zl10353_attach, &dvico_fusionhdtv_plus_v1_1,
                                                    &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_pll_attach(dev->dvb.frontend, 0x61,
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                        &dev->core->i2c_adap,
                                        &dvb_pll_thomson_dtt7579);
                 }
@@ -619,10 +619,10 @@ static int dvb_register(struct cx8802_dev *dev)
 #endif /* HAVE_MT352 || HAVE_ZL10353 */
 #ifdef HAVE_MT352
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T1:
-                dev->dvb.frontend = mt352_attach(&dvico_fusionhdtv,
+                dev->dvb.frontend = dvb_attach(mt352_attach, &dvico_fusionhdtv,
                                                  &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_pll_attach(dev->dvb.frontend, 0x61,
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                        &dev->core->i2c_adap,
                                        &dvb_pll_lg_z201);
                 }
@@ -630,10 +630,10 @@ static int dvb_register(struct cx8802_dev *dev)
         case CX88_BOARD_KWORLD_DVB_T:
         case CX88_BOARD_DNTV_LIVE_DVB_T:
         case CX88_BOARD_ADSTECH_DVB_T_PCI:
-                dev->dvb.frontend = mt352_attach(&dntv_live_dvbt_config,
+                dev->dvb.frontend = dvb_attach(mt352_attach, &dntv_live_dvbt_config,
                                                  &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_pll_attach(dev->dvb.frontend, 0x61,
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                        &dev->core->i2c_adap,
                                        &dvb_pll_unknown_1);
                 }
@@ -642,7 +642,7 @@ static int dvb_register(struct cx8802_dev *dev)
 #ifdef HAVE_VP3054_I2C
                 dev->core->pll_addr = 0x61;
                 dev->core->pll_desc = &dvb_pll_fmd1216me;
-                dev->dvb.frontend = mt352_attach(&dntv_live_dvbt_pro_config,
+                dev->dvb.frontend = dvb_attach(mt352_attach, &dntv_live_dvbt_pro_config,
                         &((struct vp3054_i2c_state *)dev->card_priv)->adap);
                 if (dev->dvb.frontend != NULL) {
                         dev->dvb.frontend->ops.tuner_ops.set_params = dntv_live_dvbt_pro_tuner_set_params;
@@ -656,7 +656,7 @@ static int dvb_register(struct cx8802_dev *dev)
         case CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID:
                 dev->core->pll_addr = 0x61;
                 dev->core->pll_desc = &dvb_pll_thomson_fe6600;
-                dev->dvb.frontend = zl10353_attach(&dvico_fusionhdtv_hybrid,
+                dev->dvb.frontend = dvb_attach(zl10353_attach, &dvico_fusionhdtv_hybrid,
                                                    &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
                         dev->dvb.frontend->ops.tuner_ops.set_params = dvico_hybrid_tuner_set_params;
@@ -665,10 +665,10 @@ static int dvb_register(struct cx8802_dev *dev)
 #endif
 #ifdef HAVE_OR51132
         case CX88_BOARD_PCHDTV_HD3000:
-                dev->dvb.frontend = or51132_attach(&pchdtv_hd3000,
+                dev->dvb.frontend = dvb_attach(or51132_attach, &pchdtv_hd3000,
                                                  &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_pll_attach(dev->dvb.frontend, 0x61,
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                        &dev->core->i2c_adap,
                                        &dvb_pll_thomson_dtt761x);
                 }
@@ -690,7 +690,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 fusionhdtv_3_gold.pll_rf_set = lgdt330x_pll_rf_set;
                 dev->core->pll_addr = 0x61;
                 dev->core->pll_desc = &dvb_pll_microtune_4042;
-                dev->dvb.frontend = lgdt330x_attach(&fusionhdtv_3_gold,
+                dev->dvb.frontend = dvb_attach(lgdt330x_attach, &fusionhdtv_3_gold,
                                                     &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
                         dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3302_tuner_set_params;
@@ -709,7 +709,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 mdelay(200);
                 dev->core->pll_addr = 0x61;
                 dev->core->pll_desc = &dvb_pll_thomson_dtt761x;
-                dev->dvb.frontend = lgdt330x_attach(&fusionhdtv_3_gold,
+                dev->dvb.frontend = dvb_attach(lgdt330x_attach, &fusionhdtv_3_gold,
                                                     &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
                         dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3302_tuner_set_params;
@@ -726,7 +726,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 mdelay(100);
                 cx_set(MO_GP0_IO, 1);
                 mdelay(200);
-                dev->dvb.frontend = lgdt330x_attach(&fusionhdtv_5_gold,
+                dev->dvb.frontend = dvb_attach(lgdt330x_attach, &fusionhdtv_5_gold,
                                                     &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
                         dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3303_tuner_set_params;
@@ -743,7 +743,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 mdelay(100);
                 cx_set(MO_GP0_IO, 1);
                 mdelay(200);
-                dev->dvb.frontend = lgdt330x_attach(&pchdtv_hd5500,
+                dev->dvb.frontend = dvb_attach(lgdt330x_attach, &pchdtv_hd5500,
                                                     &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
                         dev->dvb.frontend->ops.tuner_ops.set_params = lgdt3303_tuner_set_params;
@@ -753,10 +753,10 @@ static int dvb_register(struct cx8802_dev *dev)
 #endif
 #ifdef HAVE_NXT200X
         case CX88_BOARD_ATI_HDTVWONDER:
-                dev->dvb.frontend = nxt200x_attach(&ati_hdtvwonder,
+                dev->dvb.frontend = dvb_attach(nxt200x_attach, &ati_hdtvwonder,
                                                  &dev->core->i2c_adap);
                 if (dev->dvb.frontend != NULL) {
-                        dvb_pll_attach(dev->dvb.frontend, 0x61,
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61,
                                        &dev->core->i2c_adap,
                                        &dvb_pll_tuv1236d);
                 }
@@ -765,15 +765,15 @@ static int dvb_register(struct cx8802_dev *dev)
 #ifdef HAVE_CX24123
         case CX88_BOARD_HAUPPAUGE_NOVASPLUS_S1:
         case CX88_BOARD_HAUPPAUGE_NOVASE2_S1:
-                dev->dvb.frontend = cx24123_attach(&hauppauge_novas_config,
+                dev->dvb.frontend = dvb_attach(cx24123_attach, &hauppauge_novas_config,
                         &dev->core->i2c_adap);
                 if (dev->dvb.frontend) {
-                        isl6421_attach(dev->dvb.frontend, &dev->core->i2c_adap,
+                        dvb_attach(isl6421_attach, dev->dvb.frontend, &dev->core->i2c_adap,
                                        0x08, 0x00, 0x00);
                 }
                 break;
         case CX88_BOARD_KWORLD_DVBS_100:
-                dev->dvb.frontend = cx24123_attach(&kworld_dvbs_100_config,
+                dev->dvb.frontend = dvb_attach(cx24123_attach, &kworld_dvbs_100_config,
                         &dev->core->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
@@ -781,7 +781,7 @@ static int dvb_register(struct cx8802_dev *dev)
                 }
                 break;
         case CX88_BOARD_GENIATECH_DVBS:
-                dev->dvb.frontend = cx24123_attach(&geniatech_dvbs_config,
+                dev->dvb.frontend = dvb_attach(cx24123_attach, &geniatech_dvbs_config,
                                                    &dev->core->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->core->prev_set_voltage = dev->dvb.frontend->ops.set_voltage;
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index 2ffa5b5790ae..7bc3af7af50c 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -1057,7 +1057,7 @@ static int dvb_init(struct saa7134_dev *dev)
 #ifdef HAVE_MT352
         case SAA7134_BOARD_PINNACLE_300I_DVBT_PAL:
                 printk("%s: pinnacle 300i dvb setup\n",dev->name);
-                dev->dvb.frontend = mt352_attach(&pinnacle_300i,
+                dev->dvb.frontend = dvb_attach(mt352_attach, &pinnacle_300i,
                                                  &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->dvb.frontend->ops.tuner_ops.set_params = mt352_pinnacle_tuner_set_params;
@@ -1066,7 +1066,7 @@ static int dvb_init(struct saa7134_dev *dev)
 
         case SAA7134_BOARD_AVERMEDIA_777:
                 printk("%s: avertv 777 dvb setup\n",dev->name);
-                dev->dvb.frontend = mt352_attach(&avermedia_777,
+                dev->dvb.frontend = dvb_attach(mt352_attach, &avermedia_777,
                                                  &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->dvb.frontend->ops.tuner_ops.calc_regs = mt352_aver777_tuner_calc_regs;
@@ -1075,7 +1075,7 @@ static int dvb_init(struct saa7134_dev *dev)
 #endif
 #ifdef HAVE_TDA1004X
         case SAA7134_BOARD_MD7134:
-                dev->dvb.frontend = tda10046_attach(&medion_cardbus,
+                dev->dvb.frontend = dvb_attach(tda10046_attach, &medion_cardbus,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->dvb.frontend->ops.tuner_ops.init = philips_fmd1216_tuner_init;
@@ -1084,7 +1084,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_PHILIPS_TOUGH:
-                dev->dvb.frontend = tda10046_attach(&philips_tu1216_60_config,
+                dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_tu1216_60_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_tuner_60_init;
@@ -1092,7 +1092,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_FLYDVBTDUO:
-                dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config,
+                dev->dvb.frontend = dvb_attach(tda10046_attach, &tda827x_lifeview_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init;
@@ -1101,7 +1101,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_FLYDVBT_DUO_CARDBUS:
-                dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config,
+                dev->dvb.frontend = dvb_attach(tda10046_attach, &tda827x_lifeview_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init;
@@ -1110,7 +1110,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_PHILIPS_EUROPA:
-                dev->dvb.frontend = tda10046_attach(&philips_europa_config,
+                dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_europa_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->original_demod_sleep = dev->dvb.frontend->ops.sleep;
@@ -1121,7 +1121,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_VIDEOMATE_DVBT_300:
-                dev->dvb.frontend = tda10046_attach(&philips_europa_config,
+                dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_europa_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->dvb.frontend->ops.tuner_ops.init = philips_europa_tuner_init;
@@ -1130,7 +1130,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_VIDEOMATE_DVBT_200:
-                dev->dvb.frontend = tda10046_attach(&philips_tu1216_61_config,
+                dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_tu1216_61_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->dvb.frontend->ops.tuner_ops.init = philips_tu1216_tuner_61_init;
@@ -1138,7 +1138,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_PHILIPS_TIGER:
-                dev->dvb.frontend = tda10046_attach(&philips_tiger_config,
+                dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_tiger_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->dvb.frontend->ops.tuner_ops.init = philips_tiger_tuner_init;
@@ -1147,7 +1147,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
-                dev->dvb.frontend = tda10046_attach(&philips_tiger_config,
+                dev->dvb.frontend = dvb_attach(tda10046_attach, &philips_tiger_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->dvb.frontend->ops.tuner_ops.init = philips_tiger_tuner_init;
@@ -1156,7 +1156,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_FLYDVBT_LR301:
-                dev->dvb.frontend = tda10046_attach(&tda827x_lifeview_config,
+                dev->dvb.frontend = dvb_attach(tda10046_attach, &tda827x_lifeview_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->dvb.frontend->ops.tuner_ops.init = philips_tda827x_tuner_init;
@@ -1165,7 +1165,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_FLYDVB_TRIO:
-                dev->dvb.frontend = tda10046_attach(&lifeview_trio_config,
+                dev->dvb.frontend = dvb_attach(tda10046_attach, &lifeview_trio_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->dvb.frontend->ops.tuner_ops.sleep = lifeview_trio_tuner_sleep;
@@ -1173,7 +1173,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_ADS_DUO_CARDBUS_PTV331:
-                dev->dvb.frontend = tda10046_attach(&ads_tech_duo_config,
+                dev->dvb.frontend = dvb_attach(tda10046_attach, &ads_tech_duo_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->dvb.frontend->ops.tuner_ops.init = ads_duo_tuner_init;
@@ -1182,7 +1182,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_TEVION_DVBT_220RF:
-                dev->dvb.frontend = tda10046_attach(&tevion_dvbt220rf_config,
+                dev->dvb.frontend = dvb_attach(tda10046_attach, &tevion_dvbt220rf_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->dvb.frontend->ops.tuner_ops.sleep = tevion_dvb220rf_tuner_sleep;
@@ -1190,7 +1190,7 @@ static int dvb_init(struct saa7134_dev *dev)
                 }
                 break;
         case SAA7134_BOARD_FLYDVBT_HYBRID_CARDBUS:
-                dev->dvb.frontend = tda10046_attach(&ads_tech_duo_config,
+                dev->dvb.frontend = dvb_attach(tda10046_attach, &ads_tech_duo_config,
                                                     &dev->i2c_adap);
                 if (dev->dvb.frontend) {
                         dev->dvb.frontend->ops.tuner_ops.init = ads_duo_tuner_init;
@@ -1210,15 +1210,15 @@ static int dvb_init(struct saa7134_dev *dev)
 #endif
 #ifdef HAVE_NXT200X
         case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180:
-                dev->dvb.frontend = nxt200x_attach(&avertvhda180, &dev->i2c_adap);
+                dev->dvb.frontend = dvb_attach(nxt200x_attach, &avertvhda180, &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->i2c_adap, &dvb_pll_tdhu2);
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, &dev->i2c_adap, &dvb_pll_tdhu2);
                 }
                 break;
         case SAA7134_BOARD_KWORLD_ATSC110:
-                dev->dvb.frontend = nxt200x_attach(&kworldatsc110, &dev->i2c_adap);
+                dev->dvb.frontend = dvb_attach(nxt200x_attach, &kworldatsc110, &dev->i2c_adap);
                 if (dev->dvb.frontend) {
-                        dvb_pll_attach(dev->dvb.frontend, 0x61, &dev->i2c_adap, &dvb_pll_tuv1236d);
+                        dvb_attach(dvb_pll_attach, dev->dvb.frontend, 0x61, &dev->i2c_adap, &dvb_pll_tuv1236d);
                 }
                 break;
 #endif
diff --git a/drivers/media/video/video-buf-dvb.c b/drivers/media/video/video-buf-dvb.c
index 7ee8a53cd336..376d354b27f6 100644
--- a/drivers/media/video/video-buf-dvb.c
+++ b/drivers/media/video/video-buf-dvb.c
@@ -223,6 +223,9 @@ fail_dmxdev:
 fail_dmx:
         dvb_unregister_frontend(dvb->frontend);
 fail_frontend:
+        dvb_detach(dvb->frontend->ops.release_sec, dvb->frontend);
+        dvb_detach(dvb->frontend->ops.tuner_ops.release, dvb->frontend);
+        dvb_detach(dvb->frontend->ops.release, dvb->frontend);
         dvb_unregister_adapter(&dvb->adapter);
 fail_adapter:
         return result;
@@ -236,6 +239,9 @@ void videobuf_dvb_unregister(struct videobuf_dvb *dvb)
         dvb_dmxdev_release(&dvb->dmxdev);
         dvb_dmx_release(&dvb->demux);
         dvb_unregister_frontend(dvb->frontend);
+        dvb_detach(dvb->frontend->ops.release_sec, dvb->frontend);
+        dvb_detach(dvb->frontend->ops.tuner_ops.release, dvb->frontend);
+        dvb_detach(dvb->frontend->ops.release, dvb->frontend);
         dvb_unregister_adapter(&dvb->adapter);
 }