[PATCH 1/2] V4L: Cleanup cx88 - fix sparse warnings

From: mchehab
Date: Fri Oct 07 2005 - 20:05:12 EST


From: Peter Hagervall <hager@xxxxxxxxx>

* cx88-core.c: (cx88_risc_decode):
* cx88-video.c: (video_read):
* cx88.h:
- Fix a number of sparse warnings.

Signed-off-by: Peter Hagervall <hager@xxxxxxxxx>
Signed-off-by: Michael Krufky <mkrufky@xxxxxxx>
Signed-off-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxxx>

cx88-core.c | 2 +-
cx88-video.c | 2 +-
cx88.h | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)

diff -upr linux-2.6.14-rc3-git7/drivers/media/video/cx88/cx88-core.c linux/drivers/media/video/cx88/cx88-core.c
--- linux-2.6.14-rc3-git7/drivers/media/video/cx88/cx88-core.c 2005-10-07 14:54:38.925664951 -0500
+++ linux/drivers/media/video/cx88/cx88-core.c 2005-10-07 15:59:18.079770381 -0500
@@ -431,7 +431,7 @@ int cx88_sram_channel_setup(struct cx88_
/* ------------------------------------------------------------------ */
/* debug helper code */

-int cx88_risc_decode(u32 risc)
+static int cx88_risc_decode(u32 risc)
{
static char *instr[16] = {
[ RISC_SYNC >> 28 ] = "sync",
diff -upr linux-2.6.14-rc3-git7/drivers/media/video/cx88/cx88.h linux/drivers/media/video/cx88/cx88.h
--- linux-2.6.14-rc3-git7/drivers/media/video/cx88/cx88.h 2005-10-07 14:54:38.933661977 -0500
+++ linux/drivers/media/video/cx88/cx88.h 2005-10-07 15:59:18.082769261 -0500
@@ -203,8 +203,8 @@ struct cx88_board {
int tda9887_conf;
struct cx88_input input[MAX_CX88_INPUT];
struct cx88_input radio;
- int blackbird:1;
- int dvb:1;
+ unsigned int blackbird:1;
+ unsigned int dvb:1;
};

struct cx88_subid {
diff -upr linux-2.6.14-rc3-git7/drivers/media/video/cx88/cx88-video.c linux/drivers/media/video/cx88/cx88-video.c
--- linux-2.6.14-rc3-git7/drivers/media/video/cx88/cx88-video.c 2005-10-07 14:54:38.932662349 -0500
+++ linux/drivers/media/video/cx88/cx88-video.c 2005-10-07 15:59:18.081769635 -0500
@@ -787,7 +787,7 @@ static int video_open(struct inode *inod
}

static ssize_t
-video_read(struct file *file, char *data, size_t count, loff_t *ppos)
+video_read(struct file *file, char __user *data, size_t count, loff_t *ppos)
{
struct cx8800_fh *fh = file->private_data;

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/