patch-2.1.81 linux/drivers/scsi/t128.c

Next file: linux/drivers/sound/audio.c
Previous file: linux/drivers/scsi/scsi.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.80/linux/drivers/scsi/t128.c linux/drivers/scsi/t128.c
@@ -141,11 +141,11 @@
 #define NO_OVERRIDES (sizeof(overrides) / sizeof(struct override))
 
 static struct base {
-    unsigned char *address;
+    unsigned int address;
     int noauto;
 } bases[] __initdata = {
-    {(unsigned char *) 0xcc000, 0}, {(unsigned char *) 0xc8000, 0},
-    {(unsigned char *) 0xdc000, 0}, {(unsigned char *) 0xd8000, 0}};
+    { 0xcc000, 0}, { 0xc8000, 0}, { 0xdc000, 0}, { 0xd8000, 0}
+};
 
 #define NO_BASES (sizeof (bases) / sizeof (struct base))
 
@@ -178,7 +178,7 @@
 	    overrides[commandline_current].address = (unsigned char *) ints[1];
 	    overrides[commandline_current].irq = ints[2];
 	    for (i = 0; i < NO_BASES; ++i)
-		if (bases[i].address == (unsigned char *) ints[1]) {
+		if (bases[i].address == ints[1]) {
 		    bases[i].noauto = 1;
 		    break;
 		}
@@ -216,7 +216,7 @@
 	else 
 	    for (; !base && (current_base < NO_BASES); ++current_base) {
 #if (TDEBUG & TDEBUG_INIT)
-    printk("scsi-t128 : probing address %08x\n", (unsigned int) bases[current_base].address);
+    printk("scsi-t128 : probing address %08x\n", bases[current_base].address);
 #endif
 		for (sig = 0; sig < NO_SIGNATURES; ++sig) 
 		    if (!bases[current_base].noauto && 
@@ -224,7 +224,7 @@
 					signatures[sig].offset,
 					signatures[sig].string,
 					strlen(signatures[sig].string))) {
-		      base = bases[current_base].address;
+			base = (unsigned char *) bases[current_base].address;
 #if (TDEBUG & TDEBUG_INIT)
 			printk("scsi-t128 : detected board.\n");
 #endif

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov