diff options
author | Oliver Endriss <o.endriss@gmx.de> | 2007-07-12 19:37:50 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-18 13:24:44 -0400 |
commit | 804b4458943f14bf144d3c3ba50097ced9b27b29 (patch) | |
tree | 4c8b32cd168c3ded1215218b84545ec2361ca764 /drivers/media/common | |
parent | 372280d2a3593e90d8849a5dc5676d2e9799e3a3 (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/common')
-rw-r--r-- | drivers/media/common/saa7146_core.c | 8 | ||||
-rw-r--r-- | drivers/media/common/saa7146_video.c | 8 |
2 files changed, 8 insertions, 8 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 | ||
28 | unsigned int saa7146_debug; | 28 | unsigned int saa7146_debug; |
29 | 29 | ||
30 | module_param(saa7146_debug, int, 0644); | 30 | module_param(saa7146_debug, uint, 0644); |
31 | MODULE_PARM_DESC(saa7146_debug, "debug level (default: 0)"); | 31 | MODULE_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 | ||
133 | char *saa7146_vmalloc_build_pgtable(struct pci_dev *pci, long length, struct saa7146_pgtable *pt) | 133 | void *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 | ||
171 | void saa7146_vfree_destroy_pgtable(struct pci_dev *pci, char *mem, struct saa7146_pgtable *pt) | 171 | void 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 | } |