[PATCH] drivers/scsi/3w-xxxx.c check_region -> request_region (241p9)

From: Rasmus Andersen (rasmus@jaquet.dk)
Date: Mon Jan 22 2001 - 18:33:21 EST


(Sorry, forgot lk.)

Hi.

The following patch makes drivers/scsi/3w-xxxx.c use the return
code from request_region instead of check_region.

It applies cleanly against ac10 and 241p9.

Comments?

--- linux-ac10-clean/drivers/scsi/3w-xxxx.c Thu Nov 9 02:09:50 2000
+++ linux-ac10/drivers/scsi/3w-xxxx.c Tue Jan 23 00:22:28 2001
@@ -659,8 +659,8 @@
                         continue;
                 }
 
- /* Make sure that io region isn't already taken */
- if (check_region((tw_dev->tw_pci_dev->resource[0].start), TW_IO_ADDRESS_RANGE)) {
+ /* Reserve the io address space */
+ if (!request_region((tw_dev->tw_pci_dev->resource[0].start), TW_IO_ADDRESS_RANGE, TW_DEVICE_NAME)) {
                         printk(KERN_WARNING "3w-xxxx: tw_findcards(): Couldn't get io range 0x%lx-0x%lx for card %d.\n",
                                 (tw_dev->tw_pci_dev->resource[0].start),
                                 (tw_dev->tw_pci_dev->resource[0].start) +
@@ -670,8 +670,6 @@
                         continue;
                 }
     
- /* Reserve the io address space */
- request_region((tw_dev->tw_pci_dev->resource[0].start), TW_IO_ADDRESS_RANGE, TW_DEVICE_NAME);
                 error = tw_initialize_units(tw_dev);
                 if (error) {
                         printk(KERN_WARNING "3w-xxxx: tw_findcards(): Couldn't initialize units for card %d.\n", numcards);

-- 
Regards,
        Rasmus(rasmus@jaquet.dk)

"I begin by taking. I shall find scholars later to demonstrate my perfect right." - Frederick (II) the Great - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Tue Jan 23 2001 - 21:00:26 EST