diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-09-06 13:02:43 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-10-12 07:37:00 -0400 |
commit | 2796073a3d9cc4f610f1e68b3f62c197d86577ab (patch) | |
tree | 13762336b24c7ecb0d5cbb7724e3d8d54be321cd /drivers/media/video/cx18 | |
parent | f2a01a0027b29f682c3833d582e2827a4690f661 (diff) |
V4L/DVB (8939): cx18: fix sparse warnings
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx18')
-rw-r--r-- | drivers/media/video/cx18/cx18-driver.c | 2 | ||||
-rw-r--r-- | drivers/media/video/cx18/cx18-io.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c index 202b2819014..4de7b501f20 100644 --- a/drivers/media/video/cx18/cx18-driver.c +++ b/drivers/media/video/cx18/cx18-driver.c | |||
@@ -82,7 +82,7 @@ static int mmio_ndelay[CX18_MAX_CARDS] = { -1, -1, -1, -1, -1, -1, -1, -1, | |||
82 | static unsigned cardtype_c = 1; | 82 | static unsigned cardtype_c = 1; |
83 | static unsigned tuner_c = 1; | 83 | static unsigned tuner_c = 1; |
84 | static unsigned radio_c = 1; | 84 | static unsigned radio_c = 1; |
85 | static int mmio_ndelay_c = 1; | 85 | static unsigned mmio_ndelay_c = 1; |
86 | static char pal[] = "--"; | 86 | static char pal[] = "--"; |
87 | static char secam[] = "--"; | 87 | static char secam[] = "--"; |
88 | static char ntsc[] = "-"; | 88 | static char ntsc[] = "-"; |
diff --git a/drivers/media/video/cx18/cx18-io.c b/drivers/media/video/cx18/cx18-io.c index 5d07b0fd8a1..55d1df93292 100644 --- a/drivers/media/video/cx18/cx18-io.c +++ b/drivers/media/video/cx18/cx18-io.c | |||
@@ -27,7 +27,7 @@ | |||
27 | void cx18_memcpy_fromio(struct cx18 *cx, void *to, | 27 | void cx18_memcpy_fromio(struct cx18 *cx, void *to, |
28 | const void __iomem *from, unsigned int len) | 28 | const void __iomem *from, unsigned int len) |
29 | { | 29 | { |
30 | const u8 *src = from; | 30 | const u8 __iomem *src = from; |
31 | u8 *dst = to; | 31 | u8 *dst = to; |
32 | 32 | ||
33 | /* Align reads on the CX23418's addresses */ | 33 | /* Align reads on the CX23418's addresses */ |
@@ -61,7 +61,7 @@ void cx18_memcpy_fromio(struct cx18 *cx, void *to, | |||
61 | 61 | ||
62 | void cx18_memset_io(struct cx18 *cx, void __iomem *addr, int val, size_t count) | 62 | void cx18_memset_io(struct cx18 *cx, void __iomem *addr, int val, size_t count) |
63 | { | 63 | { |
64 | u8 *dst = addr; | 64 | u8 __iomem *dst = addr; |
65 | u16 val2 = val | (val << 8); | 65 | u16 val2 = val | (val << 8); |
66 | u32 val4 = val2 | (val2 << 16); | 66 | u32 val4 = val2 | (val2 << 16); |
67 | 67 | ||