From 2e4b2d352624030aac8d334836e845b63a1b11ec Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 28 Sep 2006 18:38:46 -0300 Subject: Fix some errors at cx88-mpeg From: Mauro Carvalho Chehab The previous cx88-mpeg patch introduced those errors while compiling: CC [M] /home/v4l/master2/v4l/cx88-mpeg.o /home/v4l/master2/v4l/cx88-mpeg.c: In function 'cx8802_request_acquire': /home/v4l/master2/v4l/cx88-mpeg.c:645: warning: comparison between pointer and integer /home/v4l/master2/v4l/cx88-mpeg.c:645: error: called object '"<7>%s/2-mpeg: "' is not a function /home/v4l/master2/v4l/cx88-mpeg.c: In function 'cx8802_request_release': /home/v4l/master2/v4l/cx88-mpeg.c:660: warning: comparison between pointer and integer /home/v4l/master2/v4l/cx88-mpeg.c:660: error: called object '"<7>%s/2-mpeg: "' is not a function Also, at cx88.h, it is reintroducing this prototype: extern void cx88_print_ioctl(char *name, unsigned int cmd) This function were removed in the past, since it were replaced by a more generic one on v4l2-common.c. Signed-off-by: Mauro Carvalho Chehab --- linux/drivers/media/video/cx88/cx88-mpeg.c | 5 +++-- linux/drivers/media/video/cx88/cx88.h | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'linux') diff --git a/linux/drivers/media/video/cx88/cx88-mpeg.c b/linux/drivers/media/video/cx88/cx88-mpeg.c index b36373722..b5ef885ac 100644 --- a/linux/drivers/media/video/cx88/cx88-mpeg.c +++ b/linux/drivers/media/video/cx88/cx88-mpeg.c @@ -642,7 +642,8 @@ int cx8802_request_acquire(struct cx8802_driver *drv) { core->active_type_id = drv->type_id; drv->advise_acquire(drv); - mpeg_dbg("%s() Post acquire GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO)); + + mpeg_dbg(1,"%s() Post acquire GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO)); } return 0; @@ -657,7 +658,7 @@ int cx8802_request_release(struct cx8802_driver *drv) { drv->advise_release(drv); core->active_type_id = CX88_BOARD_NONE; - mpeg_dbg("%s() Post release GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO)); + mpeg_dbg(1,"%s() Post release GPIO=%x\n", __FUNCTION__, cx_read(MO_GP0_IO)); } return 0; diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h index ee8c95ab2..5f84e3af5 100644 --- a/linux/drivers/media/video/cx88/cx88.h +++ b/linux/drivers/media/video/cx88/cx88.h @@ -552,7 +552,6 @@ struct cx8802_dev { extern void cx88_print_irqbits(char *name, char *tag, char **strings, u32 bits, u32 mask); -extern void cx88_print_ioctl(char *name, unsigned int cmd); extern int cx88_core_irq(struct cx88_core *core, u32 status); extern void cx88_wakeup(struct cx88_core *core, -- cgit v1.2.3