V4L/DVB (5840): fix dst and cx24123: tune() callback changed signess for delay
authorMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 16 Jul 2007 12:27:20 +0000 (09:27 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 18 Jul 2007 17:24:46 +0000 (14:24 -0300)
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>
drivers/media/dvb/bt8xx/dst.c
drivers/media/dvb/frontends/cx24123.c

index e908e3cf1e506fe554bdf18b01c7a48b1686535d..b7a17e69ca4dd796bab6ea615540f41232972f48 100644 (file)
@@ -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;
index 732e94aaa364779f53920780f7b04a5dc7e0e5fa..0834c0677fef8f86ba807b272e21b782d6ebb394 100644 (file)
@@ -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;