V4L/DVB (6881): include struct analog_demod_ops directly inside struct dvb_frontend

Rather than using a pointer, include struct analog_demod_ops directly
inside struct dvb_frontend.  This will allow us to use dvb_attach in
the future, along with removing the need to check the ops structure
before having to check the pointer to the method being called.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 417802f83f7e..aa4133f0bd19 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -105,7 +105,7 @@ struct analog_demod_info {
         char *name;
 };
 
-struct analog_tuner_ops {
+struct analog_demod_ops {
 
         struct analog_demod_info info;
 
@@ -168,7 +168,7 @@ struct dvb_frontend_ops {
         int (*ts_bus_ctrl)(struct dvb_frontend* fe, int acquire);
 
         struct dvb_tuner_ops tuner_ops;
-        struct analog_tuner_ops *analog_demod_ops;
+        struct analog_demod_ops analog_ops;
 };
 
 #define MAX_EVENT 8