[PATCH] Fix zoran_card compilation warning

[PATCH] Fix zoran_card compilation warning

[Jean Delvare]

Hi Ronald, all,

Fix the following warning which was introduced in 2.6.15-git8 by
commit 7408187d223f63d46a13b6a35b8f96b032c2f623:

  CC [M]  drivers/media/video/zoran_card.o
drivers/media/video/zoran_card.c: In function `zr36057_init':
drivers/media/video/zoran_card.c:1053: warning: assignment makes integer from pointer without a cast

Signed-off-by: Jean Delvare <khali@linux-fr.org>
---
 drivers/media/video/zoran_card.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- linux-2.6.15-git.orig/drivers/media/video/zoran_card.c	2006-01-12 20:34:54.000000000 +0100
+++ linux-2.6.15-git/drivers/media/video/zoran_card.c	2006-01-12 20:47:26.000000000 +0100
@@ -995,7 +995,7 @@
 static int __devinit
 zr36057_init (struct zoran *zr)
 {
-	unsigned long mem;
+	u32 *mem;
 	void *vdev;
 	unsigned mem_needed;
 	int j;
@@ -1058,10 +1058,10 @@
 			"%s: zr36057_init() - kmalloc (STAT_COM) failed\n",
 			ZR_DEVNAME(zr));
 		kfree(vdev);
-		kfree((void *)mem);
+		kfree(mem);
 		return -ENOMEM;
 	}
-	zr->stat_com = (u32 *) mem;
+	zr->stat_com = mem;
 	for (j = 0; j < BUZ_NUM_STAT_COM; j++) {
 		zr->stat_com[j] = 1;	/* mark as unavailable to zr36057 */
 	}


-- 
Jean Delvare

Re: [PATCH] Fix zoran_card compilation warning

[Jean Delvare]

Hi Linus, all,

Can we get this one merged before 2.6.16-rc1 please? Thanks.

Fix the following warning which was introduced in 2.6.15-git8 by
commit 7408187d223f63d46a13b6a35b8f96b032c2f623:

  CC [M]  drivers/media/video/zoran_card.o
drivers/media/video/zoran_card.c: In function `zr36057_init':
drivers/media/video/zoran_card.c:1053: warning: assignment makes integer from pointer without a cast

Signed-off-by: Jean Delvare <khali@linux-fr.org>
---
 drivers/media/video/zoran_card.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- linux-2.6.15-git.orig/drivers/media/video/zoran_card.c	2006-01-12 20:34:54.000000000 +0100
+++ linux-2.6.15-git/drivers/media/video/zoran_card.c	2006-01-12 20:47:26.000000000 +0100
@@ -995,7 +995,7 @@
 static int __devinit
 zr36057_init (struct zoran *zr)
 {
-	unsigned long mem;
+	u32 *mem;
 	void *vdev;
 	unsigned mem_needed;
 	int j;
@@ -1058,10 +1058,10 @@
 			"%s: zr36057_init() - kmalloc (STAT_COM) failed\n",
 			ZR_DEVNAME(zr));
 		kfree(vdev);
-		kfree((void *)mem);
+		kfree(mem);
 		return -ENOMEM;
 	}
-	zr->stat_com = (u32 *) mem;
+	zr->stat_com = mem;
 	for (j = 0; j < BUZ_NUM_STAT_COM; j++) {
 		zr->stat_com[j] = 1;	/* mark as unavailable to zr36057 */
 	}


-- 
Jean Delvare

Re: [PATCH] Fix zoran_card compilation warning

[Ronald S. Bultje]

Hi Linus/Andrew,

On Sun, 2006-01-15 at 13:13 +0100, Jean Delvare wrote:
>   CC [M]  drivers/media/video/zoran_card.o
> drivers/media/video/zoran_card.c: In function `zr36057_init':
> drivers/media/video/zoran_card.c:1053: warning: assignment makes integer from pointer without a cast
> 
> Signed-off-by: Jean Delvare <khali@linux-fr.org>
> ---
>  drivers/media/video/zoran_card.c |    6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> --- linux-2.6.15-git.orig/drivers/media/video/zoran_card.c	2006-01-12 20:34:54.000000000 +0100
> +++ linux-2.6.15-git/drivers/media/video/zoran_card.c	2006-01-12 20:47:26.000000000 +0100
> @@ -995,7 +995,7 @@
>  static int __devinit
>  zr36057_init (struct zoran *zr)
>  {
> -	unsigned long mem;
> +	u32 *mem;
>  	void *vdev;
>  	unsigned mem_needed;
>  	int j;
> @@ -1058,10 +1058,10 @@
>  			"%s: zr36057_init() - kmalloc (STAT_COM) failed\n",
>  			ZR_DEVNAME(zr));
>  		kfree(vdev);
> -		kfree((void *)mem);
> +		kfree(mem);
>  		return -ENOMEM;
>  	}
> -	zr->stat_com = (u32 *) mem;
> +	zr->stat_com = mem;
>  	for (j = 0; j < BUZ_NUM_STAT_COM; j++) {
>  		zr->stat_com[j] = 1;	/* mark as unavailable to zr36057 */
>  	}
> 

I support this change, please apply it. It's something left-over from
the time that all computers were 32-bit. Apart from this warning (which
nobody really cared about), the driver was already tested to work fine
on AMD64 computers in 64-bit mode.

Thank you,
Ronald