[PATCH] drivers/scsi/g_NCR5380.c: check_*_region -> request_*_region (241p9)

[Rasmus Andersen]

Hi.

(I have not been able to find a maintainer for this code.)

The following patch makes drivers/scsi/g_NCR5380.c check the
return code of request_region instead of using check_region.
Ditto for request_mem_region.

It applies cleanly against ac10 and 241p9.

Comments?

--- linux-ac10-clean/drivers/scsi/g_NCR5380.c	Sat Jan 20 15:17:13 2001
+++ linux-ac10/drivers/scsi/g_NCR5380.c	Mon Jan 22 22:49:41 2001
@@ -361,7 +361,7 @@
 	        }
 	    else
 	        for(i=0; ports[i]; i++) {
-	            if ((!check_region(ports[i], 16)) && (inb(ports[i]) == 0xff))
+			if ((inb(ports[i]) == 0xff) && request_region(ports[i], NCR5380_region_size))
 	                break;
 		}
 	    if (ports[i]) {
@@ -379,15 +379,10 @@
 	    } else
 	        continue;
 	}
-
-	request_region(overrides[current_override].NCR5380_map_name,
-					NCR5380_region_size, "ncr5380");
 #else
-	if(check_mem_region(overrides[current_override].NCR5380_map_name,
-		NCR5380_region_size))
+	if(!request_mem_region(overrides[current_override].NCR5380_map_name,
+		NCR5380_region_size, "ncr5380"))
 		continue;
-	request_mem_region(overrides[current_override].NCR5380_map_name,
-					NCR5380_region_size, "ncr5380");
 #endif
 	instance = scsi_register (tpnt, sizeof(struct NCR5380_hostdata));
 	if(instance == NULL)

-- 
Regards,
        Rasmus([e-mail])

Half this game is ninety percent mental.
-Philadelphia Phillies manager Danny Ozark