[PATCH 07/12] [media] dvb_frontend: merge the two dvb_frontend_detach() versions

[Max Kellermann]

This code duplication is confusing and error prone.  Let's merge them
by moving the release/dvb_detach call into one function with one
#ifdef.

Signed-off-by: Max Kellermann 
---
 drivers/media/dvb-core/dvb_frontend.c |   42 +
 1 file changed, 12 insertions(+), 30 deletions(-)

diff --git a/drivers/media/dvb-core/dvb_frontend.c 
b/drivers/media/dvb-core/dvb_frontend.c
index fea635b..1177414 100644
--- a/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -2754,40 +2754,22 @@ int dvb_unregister_frontend(struct dvb_frontend* fe)
 }
 EXPORT_SYMBOL(dvb_unregister_frontend);
 
-#ifdef CONFIG_MEDIA_ATTACH
-void dvb_frontend_detach(struct dvb_frontend* fe)
+static void dvb_frontend_invoke_release(struct dvb_frontend *fe,
+   void (*release)(struct dvb_frontend 
*fe))
 {
-   void *ptr;
-
-   if (fe->ops.release_sec) {
-   fe->ops.release_sec(fe);
-   dvb_detach(fe->ops.release_sec);
-   }
-   if (fe->ops.tuner_ops.release) {
-   fe->ops.tuner_ops.release(fe);
-   dvb_detach(fe->ops.tuner_ops.release);
-   }
-   if (fe->ops.analog_ops.release) {
-   fe->ops.analog_ops.release(fe);
-   dvb_detach(fe->ops.analog_ops.release);
-   }
-   ptr = (void*)fe->ops.release;
-   if (ptr) {
-   fe->ops.release(fe);
-   dvb_detach(ptr);
+   if (release) {
+   release(fe);
+#ifdef CONFIG_MEDIA_ATTACH
+   dvb_detach(release);
+#endif
}
 }
-#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.analog_ops.release)
-   fe->ops.analog_ops.release(fe);
-   if (fe->ops.release)
-   fe->ops.release(fe);
+   dvb_frontend_invoke_release(fe, fe->ops.release_sec);
+   dvb_frontend_invoke_release(fe, fe->ops.tuner_ops.release);
+   dvb_frontend_invoke_release(fe, fe->ops.analog_ops.release);
+   dvb_frontend_invoke_release(fe, fe->ops.release);
 }
-#endif
 EXPORT_SYMBOL(dvb_frontend_detach);

[PATCH 07/12] [media] dvb_frontend: merge the two dvb_frontend_detach() versions

[Max Kellermann]

This code duplication is confusing and error prone.  Let's merge them
by moving the release/dvb_detach call into one function with one
#ifdef.

Signed-off-by: Max Kellermann 
---
 drivers/media/dvb-core/dvb_frontend.c |   42 +
 1 file changed, 12 insertions(+), 30 deletions(-)

diff --git a/drivers/media/dvb-core/dvb_frontend.c 
b/drivers/media/dvb-core/dvb_frontend.c
index fea635b..1177414 100644
--- a/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -2754,40 +2754,22 @@ int dvb_unregister_frontend(struct dvb_frontend* fe)
 }
 EXPORT_SYMBOL(dvb_unregister_frontend);
 
-#ifdef CONFIG_MEDIA_ATTACH
-void dvb_frontend_detach(struct dvb_frontend* fe)
+static void dvb_frontend_invoke_release(struct dvb_frontend *fe,
+   void (*release)(struct dvb_frontend 
*fe))
 {
-   void *ptr;
-
-   if (fe->ops.release_sec) {
-   fe->ops.release_sec(fe);
-   dvb_detach(fe->ops.release_sec);
-   }
-   if (fe->ops.tuner_ops.release) {
-   fe->ops.tuner_ops.release(fe);
-   dvb_detach(fe->ops.tuner_ops.release);
-   }
-   if (fe->ops.analog_ops.release) {
-   fe->ops.analog_ops.release(fe);
-   dvb_detach(fe->ops.analog_ops.release);
-   }
-   ptr = (void*)fe->ops.release;
-   if (ptr) {
-   fe->ops.release(fe);
-   dvb_detach(ptr);
+   if (release) {
+   release(fe);
+#ifdef CONFIG_MEDIA_ATTACH
+   dvb_detach(release);
+#endif
}
 }
-#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.analog_ops.release)
-   fe->ops.analog_ops.release(fe);
-   if (fe->ops.release)
-   fe->ops.release(fe);
+   dvb_frontend_invoke_release(fe, fe->ops.release_sec);
+   dvb_frontend_invoke_release(fe, fe->ops.tuner_ops.release);
+   dvb_frontend_invoke_release(fe, fe->ops.analog_ops.release);
+   dvb_frontend_invoke_release(fe, fe->ops.release);
 }
-#endif
 EXPORT_SYMBOL(dvb_frontend_detach);