aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorOliver Endriss <o.endriss@gmx.de>2007-07-12 19:37:50 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-07-18 13:24:44 -0400
commit804b4458943f14bf144d3c3ba50097ced9b27b29 (patch)
tree4c8b32cd168c3ded1215218b84545ec2361ca764 /drivers/media
parent372280d2a3593e90d8849a5dc5676d2e9799e3a3 (diff)
V4L/DVB (5835): saa7146/dvb-ttpci: Fix signedness warnings (gcc 4.1.1, kernel 2.6.22)
Fix signedness warnings (gcc 4.1.1, kernel 2.6.22). Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/common/saa7146_core.c8
-rw-r--r--drivers/media/common/saa7146_video.c8
-rw-r--r--drivers/media/dvb/ttpci/av7110_av.c8
-rw-r--r--drivers/media/dvb/ttpci/av7110_ca.c4
-rw-r--r--drivers/media/dvb/ttpci/av7110_hw.c8
-rw-r--r--drivers/media/dvb/ttpci/av7110_hw.h2
-rw-r--r--drivers/media/dvb/ttpci/av7110_v4l.c2
7 files changed, 20 insertions, 20 deletions
diff --git a/drivers/media/common/saa7146_core.c b/drivers/media/common/saa7146_core.c
index ef3e54cd9407..ba6701e97671 100644
--- a/drivers/media/common/saa7146_core.c
+++ b/drivers/media/common/saa7146_core.c
@@ -27,7 +27,7 @@ static int saa7146_num;
27 27
28unsigned int saa7146_debug; 28unsigned int saa7146_debug;
29 29
30module_param(saa7146_debug, int, 0644); 30module_param(saa7146_debug, uint, 0644);
31MODULE_PARM_DESC(saa7146_debug, "debug level (default: 0)"); 31MODULE_PARM_DESC(saa7146_debug, "debug level (default: 0)");
32 32
33#if 0 33#if 0
@@ -130,10 +130,10 @@ static struct scatterlist* vmalloc_to_sg(unsigned char *virt, int nr_pages)
130/********************************************************************************/ 130/********************************************************************************/
131/* common page table functions */ 131/* common page table functions */
132 132
133char *saa7146_vmalloc_build_pgtable(struct pci_dev *pci, long length, struct saa7146_pgtable *pt) 133void *saa7146_vmalloc_build_pgtable(struct pci_dev *pci, long length, struct saa7146_pgtable *pt)
134{ 134{
135 int pages = (length+PAGE_SIZE-1)/PAGE_SIZE; 135 int pages = (length+PAGE_SIZE-1)/PAGE_SIZE;
136 char *mem = vmalloc_32(length); 136 void *mem = vmalloc_32(length);
137 int slen = 0; 137 int slen = 0;
138 138
139 if (NULL == mem) 139 if (NULL == mem)
@@ -168,7 +168,7 @@ err_null:
168 return NULL; 168 return NULL;
169} 169}
170 170
171void saa7146_vfree_destroy_pgtable(struct pci_dev *pci, char *mem, struct saa7146_pgtable *pt) 171void saa7146_vfree_destroy_pgtable(struct pci_dev *pci, void *mem, struct saa7146_pgtable *pt)
172{ 172{
173 pci_unmap_sg(pci, pt->slist, pt->nents, PCI_DMA_FROMDEVICE); 173 pci_unmap_sg(pci, pt->slist, pt->nents, PCI_DMA_FROMDEVICE);
174 saa7146_pgtable_free(pci, pt); 174 saa7146_pgtable_free(pci, pt);
diff --git a/drivers/media/common/saa7146_video.c b/drivers/media/common/saa7146_video.c
index e3d04a4cef4d..664280c78ff2 100644
--- a/drivers/media/common/saa7146_video.c
+++ b/drivers/media/common/saa7146_video.c
@@ -889,9 +889,9 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
889 889
890 DEB_EE(("VIDIOC_QUERYCAP\n")); 890 DEB_EE(("VIDIOC_QUERYCAP\n"));
891 891
892 strcpy(cap->driver, "saa7146 v4l2"); 892 strcpy((char *)cap->driver, "saa7146 v4l2");
893 strlcpy(cap->card, dev->ext->name, sizeof(cap->card)); 893 strlcpy((char *)cap->card, dev->ext->name, sizeof(cap->card));
894 sprintf(cap->bus_info,"PCI:%s", pci_name(dev->pci)); 894 sprintf((char *)cap->bus_info,"PCI:%s", pci_name(dev->pci));
895 cap->version = SAA7146_VERSION_CODE; 895 cap->version = SAA7146_VERSION_CODE;
896 cap->capabilities = 896 cap->capabilities =
897 V4L2_CAP_VIDEO_CAPTURE | 897 V4L2_CAP_VIDEO_CAPTURE |
@@ -968,7 +968,7 @@ int saa7146_video_do_ioctl(struct inode *inode, struct file *file, unsigned int
968 } 968 }
969 memset(f,0,sizeof(*f)); 969 memset(f,0,sizeof(*f));
970 f->index = index; 970 f->index = index;
971 strlcpy(f->description,formats[index].name,sizeof(f->description)); 971 strlcpy((char *)f->description,formats[index].name,sizeof(f->description));
972 f->pixelformat = formats[index].pixelformat; 972 f->pixelformat = formats[index].pixelformat;
973 break; 973 break;
974 } 974 }
diff --git a/drivers/media/dvb/ttpci/av7110_av.c b/drivers/media/dvb/ttpci/av7110_av.c
index 58678c05aa53..f7a8219d7cfe 100644
--- a/drivers/media/dvb/ttpci/av7110_av.c
+++ b/drivers/media/dvb/ttpci/av7110_av.c
@@ -391,7 +391,7 @@ static int get_video_format(struct av7110 *av7110, u8 *buf, int count)
391 ****************************************************************************/ 391 ****************************************************************************/
392 392
393static inline long aux_ring_buffer_write(struct dvb_ringbuffer *rbuf, 393static inline long aux_ring_buffer_write(struct dvb_ringbuffer *rbuf,
394 const char *buf, unsigned long count) 394 const u8 *buf, unsigned long count)
395{ 395{
396 unsigned long todo = count; 396 unsigned long todo = count;
397 int free; 397 int free;
@@ -436,7 +436,7 @@ static void play_audio_cb(u8 *buf, int count, void *priv)
436#define FREE_COND (dvb_ringbuffer_free(&av7110->avout) >= 20 * 1024 && \ 436#define FREE_COND (dvb_ringbuffer_free(&av7110->avout) >= 20 * 1024 && \
437 dvb_ringbuffer_free(&av7110->aout) >= 20 * 1024) 437 dvb_ringbuffer_free(&av7110->aout) >= 20 * 1024)
438 438
439static ssize_t dvb_play(struct av7110 *av7110, const u8 __user *buf, 439static ssize_t dvb_play(struct av7110 *av7110, const char __user *buf,
440 unsigned long count, int nonblock, int type) 440 unsigned long count, int nonblock, int type)
441{ 441{
442 unsigned long todo = count, n; 442 unsigned long todo = count, n;
@@ -499,7 +499,7 @@ static ssize_t dvb_play_kernel(struct av7110 *av7110, const u8 *buf,
499 return count - todo; 499 return count - todo;
500} 500}
501 501
502static ssize_t dvb_aplay(struct av7110 *av7110, const u8 __user *buf, 502static ssize_t dvb_aplay(struct av7110 *av7110, const char __user *buf,
503 unsigned long count, int nonblock, int type) 503 unsigned long count, int nonblock, int type)
504{ 504{
505 unsigned long todo = count, n; 505 unsigned long todo = count, n;
@@ -959,7 +959,7 @@ static u8 iframe_header[] = { 0x00, 0x00, 0x01, 0xe0, 0x00, 0x00, 0x80, 0x00, 0x
959 959
960#define MIN_IFRAME 400000 960#define MIN_IFRAME 400000
961 961
962static int play_iframe(struct av7110 *av7110, u8 __user *buf, unsigned int len, int nonblock) 962static int play_iframe(struct av7110 *av7110, char __user *buf, unsigned int len, int nonblock)
963{ 963{
964 int i, n; 964 int i, n;
965 965
diff --git a/drivers/media/dvb/ttpci/av7110_ca.c b/drivers/media/dvb/ttpci/av7110_ca.c
index e1c1294bb767..c58e3fc509ed 100644
--- a/drivers/media/dvb/ttpci/av7110_ca.c
+++ b/drivers/media/dvb/ttpci/av7110_ca.c
@@ -151,7 +151,7 @@ static ssize_t ci_ll_write(struct dvb_ringbuffer *cibuf, struct file *file,
151{ 151{
152 int free; 152 int free;
153 int non_blocking = file->f_flags & O_NONBLOCK; 153 int non_blocking = file->f_flags & O_NONBLOCK;
154 char *page = (char *)__get_free_page(GFP_USER); 154 u8 *page = (u8 *)__get_free_page(GFP_USER);
155 int res; 155 int res;
156 156
157 if (!page) 157 if (!page)
@@ -208,7 +208,7 @@ static ssize_t ci_ll_read(struct dvb_ringbuffer *cibuf, struct file *file,
208 return -EINVAL; 208 return -EINVAL;
209 DVB_RINGBUFFER_SKIP(cibuf, 2); 209 DVB_RINGBUFFER_SKIP(cibuf, 2);
210 210
211 return dvb_ringbuffer_read(cibuf, buf, len, 1); 211 return dvb_ringbuffer_read(cibuf, (u8 *)buf, len, 1);
212} 212}
213 213
214static int dvb_ca_open(struct inode *inode, struct file *file) 214static int dvb_ca_open(struct inode *inode, struct file *file)
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c
index 70aee4eb5da4..515e8232e020 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.c
+++ b/drivers/media/dvb/ttpci/av7110_hw.c
@@ -158,7 +158,7 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len)
158 } 158 }
159 dprintk(4, "writing DRAM block %d\n", i); 159 dprintk(4, "writing DRAM block %d\n", i);
160 mwdebi(av7110, DEBISWAB, bootblock, 160 mwdebi(av7110, DEBISWAB, bootblock,
161 ((char*)data) + i * AV7110_BOOT_MAX_SIZE, AV7110_BOOT_MAX_SIZE); 161 ((u8 *)data) + i * AV7110_BOOT_MAX_SIZE, AV7110_BOOT_MAX_SIZE);
162 bootblock ^= 0x1400; 162 bootblock ^= 0x1400;
163 iwdebi(av7110, DEBISWAB, AV7110_BOOT_BASE, swab32(base), 4); 163 iwdebi(av7110, DEBISWAB, AV7110_BOOT_BASE, swab32(base), 4);
164 iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, AV7110_BOOT_MAX_SIZE, 2); 164 iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, AV7110_BOOT_MAX_SIZE, 2);
@@ -173,10 +173,10 @@ static int load_dram(struct av7110 *av7110, u32 *data, int len)
173 } 173 }
174 if (rest > 4) 174 if (rest > 4)
175 mwdebi(av7110, DEBISWAB, bootblock, 175 mwdebi(av7110, DEBISWAB, bootblock,
176 ((char*)data) + i * AV7110_BOOT_MAX_SIZE, rest); 176 ((u8 *)data) + i * AV7110_BOOT_MAX_SIZE, rest);
177 else 177 else
178 mwdebi(av7110, DEBISWAB, bootblock, 178 mwdebi(av7110, DEBISWAB, bootblock,
179 ((char*)data) + i * AV7110_BOOT_MAX_SIZE - 4, rest + 4); 179 ((u8 *)data) + i * AV7110_BOOT_MAX_SIZE - 4, rest + 4);
180 180
181 iwdebi(av7110, DEBISWAB, AV7110_BOOT_BASE, swab32(base), 4); 181 iwdebi(av7110, DEBISWAB, AV7110_BOOT_BASE, swab32(base), 4);
182 iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, rest, 2); 182 iwdebi(av7110, DEBINOSWAP, AV7110_BOOT_SIZE, rest, 2);
@@ -751,7 +751,7 @@ static int FlushText(struct av7110 *av7110)
751 return 0; 751 return 0;
752} 752}
753 753
754static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, u8* buf) 754static int WriteText(struct av7110 *av7110, u8 win, u16 x, u16 y, char *buf)
755{ 755{
756 int i, ret; 756 int i, ret;
757 unsigned long start; 757 unsigned long start;
diff --git a/drivers/media/dvb/ttpci/av7110_hw.h b/drivers/media/dvb/ttpci/av7110_hw.h
index 673d9b3f064c..74d940f75da6 100644
--- a/drivers/media/dvb/ttpci/av7110_hw.h
+++ b/drivers/media/dvb/ttpci/av7110_hw.h
@@ -393,7 +393,7 @@ static inline void iwdebi(struct av7110 *av7110, u32 config, int addr, u32 val,
393} 393}
394 394
395/* buffer writes */ 395/* buffer writes */
396static inline void mwdebi(struct av7110 *av7110, u32 config, int addr, char *val, int count) 396static inline void mwdebi(struct av7110 *av7110, u32 config, int addr, u8 *val, int count)
397{ 397{
398 memcpy(av7110->debi_virt, val, count); 398 memcpy(av7110->debi_virt, val, count);
399 av7110_debiwrite(av7110, config, addr, 0, count); 399 av7110_debiwrite(av7110, config, addr, 0, count);
diff --git a/drivers/media/dvb/ttpci/av7110_v4l.c b/drivers/media/dvb/ttpci/av7110_v4l.c
index fcd9994058d0..87afaebc0703 100644
--- a/drivers/media/dvb/ttpci/av7110_v4l.c
+++ b/drivers/media/dvb/ttpci/av7110_v4l.c
@@ -333,7 +333,7 @@ static int av7110_ioctl(struct saa7146_fh *fh, unsigned int cmd, void *arg)
333 return -EINVAL; 333 return -EINVAL;
334 334
335 memset(t, 0, sizeof(*t)); 335 memset(t, 0, sizeof(*t));
336 strcpy(t->name, "Television"); 336 strcpy((char *)t->name, "Television");
337 337
338 t->type = V4L2_TUNER_ANALOG_TV; 338 t->type = V4L2_TUNER_ANALOG_TV;
339 t->capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO | 339 t->capability = V4L2_TUNER_CAP_NORM | V4L2_TUNER_CAP_STEREO |