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/video/video-buf-dvb.c b/drivers/media/video/video-buf-dvb.c
index 376d354b27f6..f53edf1923b7 100644
--- a/drivers/media/video/video-buf-dvb.c
+++ b/drivers/media/video/video-buf-dvb.c
@@ -223,9 +223,7 @@ 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_frontend_detach(dvb->frontend);
         dvb_unregister_adapter(&dvb->adapter);
 fail_adapter:
         return result;
@@ -239,9 +237,7 @@ 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_frontend_detach(dvb->frontend);
         dvb_unregister_adapter(&dvb->adapter);
 }