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>

4 files changed, 16 insertions, 11 deletions

diff --git a/drivers/media/dvb/dvb-usb/cxusb.c b/drivers/media/dvb/dvb-usb/cxusb.c
index ae23bdde42a8..ac72e7ed9fcc 100644
--- a/drivers/media/dvb/dvb-usb/cxusb.c
+++ b/drivers/media/dvb/dvb-usb/cxusb.c
@@ -409,7 +409,7 @@ static int cxusb_cx22702_frontend_attach(struct dvb_usb_device *d)
 
         cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, &b, 1);
 
-        if ((d->fe = cx22702_attach(&cxusb_cx22702_config, &d->i2c_adap)) != NULL)
+        if ((d->fe = dvb_attach(cx22702_attach, &cxusb_cx22702_config, &d->i2c_adap)) != NULL)
                 return 0;
 
         return -EIO;
@@ -422,7 +422,7 @@ static int cxusb_lgdt3303_frontend_attach(struct dvb_usb_device *d)
 
         cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0);
 
-        if ((d->fe = lgdt330x_attach(&cxusb_lgdt3303_config, &d->i2c_adap)) != NULL)
+        if ((d->fe = dvb_attach(lgdt330x_attach, &cxusb_lgdt3303_config, &d->i2c_adap)) != NULL)
                 return 0;
 
         return -EIO;
@@ -435,7 +435,7 @@ static int cxusb_mt352_frontend_attach(struct dvb_usb_device *d)
 
         cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0);
 
-        if ((d->fe = mt352_attach(&cxusb_mt352_config, &d->i2c_adap)) != NULL)
+        if ((d->fe = dvb_attach(mt352_attach, &cxusb_mt352_config, &d->i2c_adap)) != NULL)
                 return 0;
 
         return -EIO;
@@ -448,8 +448,8 @@ static int cxusb_dee1601_frontend_attach(struct dvb_usb_device *d)
 
         cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0);
 
-        if (((d->fe = mt352_attach(&cxusb_dee1601_config, &d->i2c_adap)) != NULL) ||
-            ((d->fe = zl10353_attach(&cxusb_zl10353_dee1601_config, &d->i2c_adap)) != NULL))
+        if (((d->fe = dvb_attach(mt352_attach, &cxusb_dee1601_config, &d->i2c_adap)) != NULL) ||
+                ((d->fe = dvb_attach(zl10353_attach, &cxusb_zl10353_dee1601_config, &d->i2c_adap)) != NULL))
                 return 0;
 
         return -EIO;
diff --git a/drivers/media/dvb/dvb-usb/digitv.c b/drivers/media/dvb/dvb-usb/digitv.c
index c14d9efb48fd..f5cd3a4f82a8 100644
--- a/drivers/media/dvb/dvb-usb/digitv.c
+++ b/drivers/media/dvb/dvb-usb/digitv.c
@@ -128,11 +128,11 @@ static struct nxt6000_config digitv_nxt6000_config = {
 
 static int digitv_frontend_attach(struct dvb_usb_device *d)
 {
-        if ((d->fe = mt352_attach(&digitv_mt352_config, &d->i2c_adap)) != NULL) {
+        if ((d->fe = dvb_attach(mt352_attach, &digitv_mt352_config, &d->i2c_adap)) != NULL) {
                 d->fe->ops.tuner_ops.calc_regs = dvb_usb_tuner_calc_regs;
                 return 0;
         }
-        if ((d->fe = nxt6000_attach(&digitv_nxt6000_config, &d->i2c_adap)) != NULL) {
+        if ((d->fe = dvb_attach(nxt6000_attach, &digitv_nxt6000_config, &d->i2c_adap)) != NULL) {
                 d->fe->ops.tuner_ops.set_params = digitv_nxt6000_tuner_set_params;
                 return 0;
         }
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
index ec631708c394..f0da15ebe33b 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
@@ -188,8 +188,9 @@ int dvb_usb_fe_init(struct dvb_usb_device* d)
 
                 if (dvb_register_frontend(&d->dvb_adap, d->fe)) {
                         err("Frontend registration failed.");
-                        if (d->fe->ops.release)
-                                d->fe->ops.release(d->fe);
+                        dvb_detach(d->fe->ops.release_sec, d->fe);
+                        dvb_detach(d->fe->ops.tuner_ops.release, d->fe);
+                        dvb_detach(d->fe->ops.release, d->fe);
                         d->fe = NULL;
                         return -ENODEV;
                 }
@@ -204,7 +205,11 @@ int dvb_usb_fe_init(struct dvb_usb_device* d)
 
 int dvb_usb_fe_exit(struct dvb_usb_device *d)
 {
-        if (d->fe != NULL)
+        if (d->fe != NULL) {
                 dvb_unregister_frontend(d->fe);
+                dvb_detach(d->fe->ops.release_sec, d->fe);
+                dvb_detach(d->fe->ops.tuner_ops.release, d->fe);
+                dvb_detach(d->fe->ops.release, d->fe);
+        }
         return 0;
 }
diff --git a/drivers/media/dvb/dvb-usb/umt-010.c b/drivers/media/dvb/dvb-usb/umt-010.c
index 97d74da0dad8..418a0b707151 100644
--- a/drivers/media/dvb/dvb-usb/umt-010.c
+++ b/drivers/media/dvb/dvb-usb/umt-010.c
@@ -58,7 +58,7 @@ static int umt_mt352_frontend_attach(struct dvb_usb_device *d)
         umt_config.demod_init = umt_mt352_demod_init;
         umt_config.demod_address = 0xf;
 
-        d->fe = mt352_attach(&umt_config, &d->i2c_adap);
+        d->fe = dvb_attach(mt352_attach, &umt_config, &d->i2c_adap);
 
         return 0;
 }