Re: [PATCH] matrox w1: fix integer to pointer conversion warnings

[Jan Dittmer <jdittmer@ppp0.net>]

[-- Attachment #1: Type: text/plain, Size: 257 bytes --]

Evgeniy Polyakov wrote:
> On Sun, 14 Nov 2004 13:07:08 +0100
> Jan Dittmer <jdittmer@ppp0.net> wrote:
> 
> 
>>Get rid of some pointer to integer conversion warnings
>>in the matrox w1 bus driver.
> 

You mean like this? (Incremental to the other one)

Jan


[-- Attachment #2: w1.diff --]
[-- Type: text/x-patch, Size: 636 bytes --]

===== matrox_w1.c 1.4 vs edited =====
--- 1.4/drivers/w1/matrox_w1.c	2004-11-14 13:02:18 +01:00
+++ edited/matrox_w1.c	2004-11-14 21:15:09 +01:00
@@ -78,12 +78,12 @@
 
 struct matrox_device
 {
-	char *base_addr;
-	char *port_index, *port_data;
+	char __iomem *base_addr;
+	char __iomem *port_index, *port_data;
 	u8 data_mask;
 
 	unsigned long phys_addr;
-	char *virt_addr;
+	char __iomem *virt_addr;
 	unsigned long found;
 
 	struct w1_bus_master *bus_master;
@@ -227,7 +227,7 @@
 
 	if (dev->found) {
 		w1_remove_master_device(dev->bus_master);
-		iounmap((void *) dev->virt_addr);
+		iounmap(dev->virt_addr);
 	}
 	kfree(dev);
 }