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>

1 files changed, 20 insertions, 20 deletions

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