patch-2.4.6 linux/drivers/char/sx.c

• Lines: 93
• Date: Wed Jun 27 14:13:01 2001
• Orig file: v2.4.5/linux/drivers/char/sx.c
• Orig date: Fri Apr 6 10:42:55 2001

diff -u --recursive --new-file v2.4.5/linux/drivers/char/sx.c linux/drivers/char/sx.c
@@ -467,7 +467,7 @@
 	int i, j, ch;
 
 	for (i=0;i<len;i+=16) {
-		printk ("%08x ", (int) addr+i);
+		printk ("%p ", addr+i);
 		for (j=0;j<16;j++) {
 			printk ("%02x %s", addr[j+i], (j==7)?" ":"");
 		}
@@ -1639,7 +1639,8 @@
 	int rc = 0;
 	int *descr = (int *)arg, i;
 	static struct sx_board *board = NULL;
-	int nbytes, offset, data;
+	int nbytes, offset;
+	unsigned long data;
 	char *tmp;
 
 	func_enter();
@@ -2098,7 +2099,7 @@
 	func_enter();
 
 	if (!IS_CF_BOARD (board)) {    
-		sx_dprintk (SX_DEBUG_PROBE, "Going to verify vpd prom at %x.\n", 
+		sx_dprintk (SX_DEBUG_PROBE, "Going to verify vpd prom at %lx.\n", 
 		            board->base + SX_VPD_ROM);
 
 		if (sx_debug & SX_DEBUG_PROBE)
@@ -2123,7 +2124,7 @@
 	printheader ();
 
 	if (!IS_CF_BOARD (board)) {
-		printk (KERN_DEBUG "sx: Found an SX board at %x\n", board->hw_base);
+		printk (KERN_DEBUG "sx: Found an SX board at %lx\n", board->hw_base);
 		printk (KERN_DEBUG "sx: hw_rev: %d, assembly level: %d, uniq ID:%08x, ", 
 		        vpdp.hwrev, vpdp.hwass, vpdp.uniqid);
 		printk (           "Manufactured: %d/%d\n", 
@@ -2140,7 +2141,7 @@
 
 		if (((vpdp.uniqid >> 24) & SX_UNIQUEID_MASK) == SX_ISA_UNIQUEID1) {
 			if (board->base & 0x8000) {
-				printk (KERN_WARNING "sx: Warning: There may be hardware problems with the card at %x.\n", board->base);
+				printk (KERN_WARNING "sx: Warning: There may be hardware problems with the card at %lx.\n", board->base);
 				printk (KERN_WARNING "sx: Read sx.txt for more info.\n");
 			}
 		}
@@ -2172,7 +2173,7 @@
 	int i;
 
 	func_enter();
-	sx_dprintk (SX_DEBUG_PROBE, "Going to verify SI signature %x.\n", 
+	sx_dprintk (SX_DEBUG_PROBE, "Going to verify SI signature %lx.\n", 
 	            board->base + SI2_ISA_ID_BASE);
 
 	if (sx_debug & SX_DEBUG_PROBE)
@@ -2188,7 +2189,7 @@
 
 	printheader ();
 
-	printk (KERN_DEBUG "sx: Found an SI board at %x\n", board->hw_base);
+	printk (KERN_DEBUG "sx: Found an SI board at %lx\n", board->hw_base);
 	/* Compared to the SX boards, it is a complete guess as to what
 		 this card is up to... */
 
@@ -2507,7 +2508,7 @@
 
 			board->irq = get_irq (pdev);
 
-			sx_dprintk (SX_DEBUG_PROBE, "Got a specialix card: %x/%x(%d) %x.\n", 
+			sx_dprintk (SX_DEBUG_PROBE, "Got a specialix card: %x/%lx(%d) %x.\n", 
 			            tint, boards[found].base, board->irq, board->flags);
 
 			if (probe_sx (board)) {
@@ -2569,8 +2570,8 @@
 			board->base2 =
 			board->base = (ulong) ioremap(board->hw_base, SI2_EISA_WINDOW_LEN);
 
-			sx_dprintk(SX_DEBUG_PROBE, "IO hw_base address: %x\n", board->hw_base);
-			sx_dprintk(SX_DEBUG_PROBE, "base: %x\n", board->base);
+			sx_dprintk(SX_DEBUG_PROBE, "IO hw_base address: %lx\n", board->hw_base);
+			sx_dprintk(SX_DEBUG_PROBE, "base: %lx\n", board->base);
 			board->irq = inb(board->eisa_base+0xc02)>>4; 
 			sx_dprintk(SX_DEBUG_PROBE, "IRQ: %d\n", board->irq);
 			
@@ -2602,7 +2603,7 @@
 	for (i = 0; i < SX_NBOARDS; i++) {
 		board = &boards[i];
 		if (board->flags & SX_BOARD_INITIALIZED) {
-			sx_dprintk (SX_DEBUG_CLEANUP, "Cleaning up board at %x\n", board->base);
+			sx_dprintk (SX_DEBUG_CLEANUP, "Cleaning up board at %lx\n", board->base);
 			/* The board should stop messing with us.
 			   (actually I mean the interrupt) */
 			sx_reset (board);