aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-07-16 08:27:20 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-18 13:24:46 -0400
commit3ea96615381157fc7b94549db559adabd7d4233f (patch)
treecd0006f9ad8ec0b2a81e963569a676943096448b /drivers/media
parent260f8d7c4cda79b087a182eb03e8574ba41a171e (diff)
V4L/DVB (5840): fix dst and cx24123: tune() callback changed signess for delay
tune() dvb_frontend callback changed delay signess: int (*tune)(struct dvb_frontend* fe, struct dvb_frontend_parameters* params, unsigned int mode_flags, - int *delay, + unsigned int *delay, This change caused warnings on cx24123 and dst modules: /home/v4l/master/v4l/cx24123.c:1034: warning: initialization from incompatible pointer type /home/v4l/master/v4l/dst.c:1782: warning: initialization from incompatible pointer type /home/v4l/master/v4l/dst.c:1808: warning: initialization from incompatible pointer type /home/v4l/master/v4l/dst.c:1837: warning: initialization from incompatible pointer type /home/v4l/master/v4l/dst.c:1860: warning: initialization from incompatible pointer type This patch corrects the function prototype on both modules to follow the core change. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/dvb/bt8xx/dst.c2
-rw-r--r--drivers/media/dvb/frontends/cx24123.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index e908e3cf1e50..b7a17e69ca4d 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -1652,7 +1652,7 @@ static int dst_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_paramet
1652static int dst_tune_frontend(struct dvb_frontend* fe, 1652static int dst_tune_frontend(struct dvb_frontend* fe,
1653 struct dvb_frontend_parameters* p, 1653 struct dvb_frontend_parameters* p,
1654 unsigned int mode_flags, 1654 unsigned int mode_flags,
1655 int *delay, 1655 unsigned int *delay,
1656 fe_status_t *status) 1656 fe_status_t *status)
1657{ 1657{
1658 struct dst_state *state = fe->demodulator_priv; 1658 struct dst_state *state = fe->demodulator_priv;
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c
index 732e94aaa364..0834c0677fef 100644
--- a/drivers/media/dvb/frontends/cx24123.c
+++ b/drivers/media/dvb/frontends/cx24123.c
@@ -917,7 +917,7 @@ static int cx24123_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
917static int cx24123_tune(struct dvb_frontend* fe, 917static int cx24123_tune(struct dvb_frontend* fe,
918 struct dvb_frontend_parameters* params, 918 struct dvb_frontend_parameters* params,
919 unsigned int mode_flags, 919 unsigned int mode_flags,
920 int *delay, 920 unsigned int *delay,
921 fe_status_t *status) 921 fe_status_t *status)
922{ 922{
923 int retval = 0; 923 int retval = 0;