summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tda9887.c
diff options
context:
space:
mode:
authorMichael Krufky2007-12-21 15:18:32 +0100
committerMauro Carvalho Chehab2008-01-25 22:04:11 +0100
commitbc3e5c7fc20d3c09667067878fb7a55dd9fc041d (patch)
tree81d83ec2aa0b21f8b594d45a398bdefe206ad3e3 /drivers/media/video/tda9887.c
parentV4L/DVB (6880): kill tuner-driver.h (diff)
downloadkernel-qcow2-linux-bc3e5c7fc20d3c09667067878fb7a55dd9fc041d.tar.gz
kernel-qcow2-linux-bc3e5c7fc20d3c09667067878fb7a55dd9fc041d.tar.xz
kernel-qcow2-linux-bc3e5c7fc20d3c09667067878fb7a55dd9fc041d.zip
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>
Diffstat (limited to 'drivers/media/video/tda9887.c')
-rw-r--r--drivers/media/video/tda9887.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
index 1b017d52bfb5..d3aabe2d146b 100644
--- a/drivers/media/video/tda9887.c
+++ b/drivers/media/video/tda9887.c
@@ -648,7 +648,7 @@ static void tda9887_release(struct dvb_frontend *fe)
fe->analog_demod_priv = NULL;
}
-static struct analog_tuner_ops tda9887_tuner_ops = {
+static struct analog_demod_ops tda9887_ops = {
.info = {
.name = "TDA9887",
},
@@ -677,7 +677,8 @@ struct dvb_frontend *tda9887_attach(struct dvb_frontend *fe,
tuner_info("tda988[5/6/7] found\n");
- fe->ops.analog_demod_ops = &tda9887_tuner_ops;
+ memcpy(&fe->ops.analog_ops, &tda9887_ops,
+ sizeof(struct analog_demod_ops));
return fe;
}