[parisc-linux-cvs] Patch #1 to make the sim700 64-bit clean.

Ryan Bradetich rbradetich@uswest.net
Thu, 01 Mar 2001 21:34:30 -0700


This is a multi-part message in MIME format.
--------------48F8AE6D5C80F8DE06511E36
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit

Here is the first of a series of patches to make the sim700 driver
64-bit clean.

- Ryan


--------------48F8AE6D5C80F8DE06511E36
Content-Type: text/plain; charset=us-ascii;
 name="sim700.h.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="sim700.h.patch"

Index: sim700.h
===================================================================
RCS file: /home/cvs/parisc/linux/drivers/scsi/sim700.h,v
retrieving revision 1.5
diff -u -p -r1.5 sim700.h
--- sim700.h	2000/06/16 10:46:02	1.5
+++ sim700.h	2001/03/01 06:32:01
@@ -859,31 +859,31 @@ int sim700_release(struct Scsi_Host *);
 #if defined(__hppa__) || defined(__mc68000__)
 
 #define NCR_read8(address)	 					\
-  readb((u32)(host->base) + (u32)(address))
+  readb((unsigned long)(host->base) + (unsigned long)(address))
 
 #define NCR_read32(address) 						\
   (									\
     NCR_LE_CPU_BE ?							\
       le32_to_cpu((u32)							\
-	readl((u32)(host->base) + ((u32)(address))))			\
+	readl((unsigned long)(host->base) + ((unsigned long)(address))))	\
     :									\
-      readl((u32)(host->base) + ((u32)(address)))			\
+      readl((unsigned long)(host->base) + ((unsigned long)(address)))	\
   )
 
 #define NCR_write8(address,value) 					\
   {									\
-    u32 a = (u32)(host->base) + (u32)(address);				\
+    unsigned long a = (unsigned long)(host->base) + (unsigned long)(address);	\
 									\
-    DEB(DEB_REGS, printk("NCR: %02x => %08x\n", (u32)(value), a));	\
+    DEB(DEB_REGS, printk("NCR: %02x => %lx\n", (u32)(value), a));	\
     writeb((value), a);							\
   }
 
 #define NCR_write32(address,value)	 				\
   {									\
-    u32 a = (u32)(host->base) + (u32)(address);				\
+    unsigned long a = (unsigned long)(host->base) + (unsigned long)(address);	\
     u32 v = NCR_LE_CPU_BE ? cpu_to_le32((u32)(value)) : (u32)(value);	\
 									\
-    DEB(DEB_REGS, printk("NCR: %08x => %08x\n", v, a));			\
+    DEB(DEB_REGS, printk("NCR: %08x => %lx\n", v, a));			\
     writel(v, a);							\
   }
 

--------------48F8AE6D5C80F8DE06511E36--