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/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index e2d2e65dea52..0c3bab37d8df 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -571,9 +571,7 @@ int flexcop_frontend_init(struct flexcop_device *fc)
         } else {
                 if (dvb_register_frontend(&fc->dvb_adapter, fc->fe)) {
                         err("frontend registration failed!");
-                        dvb_detach(fc->fe->ops.release_sec, fc->fe);
-                        dvb_detach(fc->fe->ops.tuner_ops.release, fc->fe);
-                        dvb_detach(fc->fe->ops.release, fc->fe);
+                        dvb_frontend_detach(fc->fe);
                         fc->fe = NULL;
                         return -EINVAL;
                 }
@@ -586,9 +584,7 @@ void flexcop_frontend_exit(struct flexcop_device *fc)
 {
         if (fc->init_state & FC_STATE_FE_INIT) {
                 dvb_unregister_frontend(fc->fe);
-                dvb_detach(fc->fe->ops.release_sec, fc->fe);
-                dvb_detach(fc->fe->ops.tuner_ops.release, fc->fe);
-                dvb_detach(fc->fe->ops.release, fc->fe);
+                dvb_frontend_detach(fc->fe);
         }
 
         fc->init_state &= ~FC_STATE_FE_INIT;