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>

3 files changed, 34 insertions, 18 deletions

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index d544731bed7d..86dadc71cd61 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1112,3 +1112,35 @@ int dvb_unregister_frontend(struct dvb_frontend* fe)
         return 0;
 }
 EXPORT_SYMBOL(dvb_unregister_frontend);
+
+#ifdef CONFIG_DVB_DETACH
+void dvb_frontend_detach(struct dvb_frontend* fe)
+{
+        void *ptr;
+
+        if (fe->ops.release_sec) {
+                fe->ops.release_sec(fe);
+                symbol_put_addr(fe->ops.release_sec);
+        }
+        if (fe->ops.tuner_ops.release) {
+                fe->ops.tuner_ops.release(fe);
+                symbol_put_addr(fe->ops.tuner_ops.release);
+        }
+        ptr = (void*)fe->ops.release;
+        if (ptr) {
+                fe->ops.release(fe);
+                symbol_put_addr(ptr);
+        }
+}
+#else
+void dvb_frontend_detach(struct dvb_frontend* fe)
+{
+        if (fe->ops.release_sec)
+                fe->ops.release_sec(fe);
+        if (fe->ops.tuner_ops.release)
+                fe->ops.tuner_ops.release(fe);
+        if (fe->ops.release)
+                fe->ops.release(fe);
+}
+#endif
+EXPORT_SYMBOL(dvb_frontend_detach);
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 6bea01af4400..e5d5028b3694 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -158,6 +158,8 @@ extern int dvb_register_frontend(struct dvb_adapter* dvb,
 
 extern int dvb_unregister_frontend(struct dvb_frontend* fe);
 
+extern void dvb_frontend_detach(struct dvb_frontend* fe);
+
 extern void dvb_frontend_reinitialise(struct dvb_frontend *fe);
 
 extern void dvb_frontend_sleep_until(struct timeval *waketime, u32 add_usec);
diff --git a/drivers/media/dvb/dvb-core/dvbdev.h b/drivers/media/dvb/dvb-core/dvbdev.h
index 66d91e530f85..620e7887b3d3 100644
--- a/drivers/media/dvb/dvb-core/dvbdev.h
+++ b/drivers/media/dvb/dvb-core/dvbdev.h
@@ -102,7 +102,6 @@ extern int dvb_usercopy(struct inode *inode, struct file *file,
                             int (*func)(struct inode *inode, struct file *file,
                             unsigned int cmd, void *arg));
 
-
 /** generic DVB attach function. */
 #ifdef CONFIG_DVB_CORE_ATTACH
 #define dvb_attach(FUNCTION, ARGS...) ({ \
@@ -118,28 +117,11 @@ extern int dvb_usercopy(struct inode *inode, struct file *file,
         __r; \
 })
 
-#define dvb_detach(FUNCPTR, ARGS...) ({ \
-        typeof((FUNCPTR)) __funcptrtmp = FUNCPTR; \
-        if (__funcptrtmp) { \
-                __funcptrtmp(ARGS); \
-                symbol_put_addr(__funcptrtmp); \
-        } \
-        FUNCPTR = NULL; \
-})
-
 #else
 #define dvb_attach(FUNCTION, ARGS...) ({ \
         FUNCTION(ARGS); \
 })
 
-#define dvb_detach(FUNCPTR, ARGS...) \
-do { \
-        if (FUNCPTR) \
-                FUNCPTR(ARGS); \
-        FUNCPTR = NULL; \
-} while(0)
-
 #endif
 
-
 #endif /* #ifndef _DVBDEV_H_ */