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>
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index d195cf5..5742154 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -1385,9 +1385,7 @@
if (av7110->fe != NULL) {
dvb_unregister_frontend(av7110->fe);
- dvb_detach(av7110->fe->ops.release_sec, av7110->fe);
- dvb_detach(av7110->fe->ops.tuner_ops.release, av7110->fe);
- dvb_detach(av7110->fe->ops.release, av7110->fe);
+ dvb_frontend_detach(av7110->fe);
}
dvb_unregister_device(av7110->osd_dev);
av7110_av_unregister(av7110);
@@ -2259,9 +2257,7 @@
ret = dvb_register_frontend(&av7110->dvb_adapter, av7110->fe);
if (ret < 0) {
printk("av7110: Frontend registration failed!\n");
- dvb_detach(av7110->fe->ops.release_sec, av7110->fe);
- dvb_detach(av7110->fe->ops.tuner_ops.release, av7110->fe);
- dvb_detach(av7110->fe->ops.release, av7110->fe);
+ dvb_frontend_detach(av7110->fe);
av7110->fe = NULL;
}
}