V4L/DVB (4391): Refactor dvb_detach calls into a single dvb_frontend_detach function.

Remove buggy dvb_detach() macro and replace with unified
dvb_frontend_detach() call.

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

1 files changed, 2 insertions, 6 deletions

diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
index f0da15ebe33..9f8d3f0ca5a 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
@@ -188,9 +188,7 @@ int dvb_usb_fe_init(struct dvb_usb_device* d)
 
                 if (dvb_register_frontend(&d->dvb_adap, d->fe)) {
                         err("Frontend registration failed.");
-                        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);
+                        dvb_frontend_detach(d->fe);
                         d->fe = NULL;
                         return -ENODEV;
                 }
@@ -207,9 +205,7 @@ int dvb_usb_fe_exit(struct dvb_usb_device *d)
 {
         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);
+                dvb_frontend_detach(d->fe);
         }
         return 0;
 }