Commit 3ea96615 authored Jul 16, 2007 by Mauro Carvalho Chehab

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>

parent 260f8d7c

drivers/media/dvb/bt8xx/dst.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1652,7 +1652,7 @@ static int dst_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_paramet
		static int dst_tune_frontend(struct dvb_frontend* fe,
		struct dvb_frontend_parameters* p,
		unsigned int mode_flags,
		int *delay,
		unsigned int *delay,
		fe_status_t *status)
		{
		struct dst_state *state = fe->demodulator_priv;

drivers/media/dvb/frontends/cx24123.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -917,7 +917,7 @@ static int cx24123_set_tone(struct dvb_frontend* fe, fe_sec_tone_mode_t tone)
		static int cx24123_tune(struct dvb_frontend* fe,
		struct dvb_frontend_parameters* params,
		unsigned int mode_flags,
		int *delay,
		unsigned int *delay,
		fe_status_t *status)
		{
		int retval = 0;