drivers/scsi/cpqfcTSinit.c cleanup (241p9)

@@ -96,7 +96,7 @@
    Name) are not necessary.
    
 */
-static void Cpqfc_initHBAdata( CPQFCHBA *cpqfcHBAdata, struct pci_dev *PciDev )
+static int Cpqfc_initHBAdata( CPQFCHBA *cpqfcHBAdata, struct pci_dev *PciDev )
 {
              
   cpqfcHBAdata->PciDev = PciDev; // copy PCI info ptr

@@ -115,6 +115,9 @@
   cpqfcHBAdata->fcChip.Registers.ReMapMemBase = 
     ioremap( PciDev->base_address[3] & PCI_BASE_ADDRESS_MEM_MASK,
              0x200);
+
+  if (!cpqfcHBAdata->fcChip.Registers.ReMapMemBase)
+	  return 1;
   
   cpqfcHBAdata->fcChip.Registers.RAMBase = 
     PciDev->base_address[4];

@@ -209,7 +212,7 @@
   cpqfcHBAdata->fcChip.ReadWriteWWN = CpqTsReadWriteWWN;
   cpqfcHBAdata->fcChip.ReadWriteNVRAM = CpqTsReadWriteNVRAM;
 
- 
+  return 0;
 
 }
 

@@ -329,8 +332,11 @@
       cpqfcHBAdata->HBAnum = NumberOfAdapters;
 
       cpqfcHBAdata->HostAdapter = HostAdapter; // back ptr
-      Cpqfc_initHBAdata( cpqfcHBAdata, PciDev ); // fill MOST fields
-     
+      if (!Cpqfc_initHBAdata( cpqfcHBAdata, PciDev )) { // fill MOST fields
+	      printk(KERN_WARNING "Error initializing cpqfc data\n");
+	      goto err_unregister;
+      }
+		      
       cpqfcHBAdata->HBAnum = NumberOfAdapters;
 
 

@@ -342,33 +348,25 @@
 		       HostAdapter) )
       {
 	printk(" IRQ %u already used\n", HostAdapter->irq);
-        scsi_unregister( HostAdapter);
-	continue;
+	goto err_unmap;
       }
 
       // Since we have two 256-byte I/O port ranges (upper
-      // and lower), check them both
-      if( check_region( cpqfcHBAdata->fcChip.Registers.IOBaseU, 0xff) )
+      // and lower), get them both
+      if(!request_region( cpqfcHBAdata->fcChip.Registers.IOBaseU, 0xff, DEV_NAME) )
       {
 	printk("  cpqfcTS address in use: %x\n", 
 			cpqfcHBAdata->fcChip.Registers.IOBaseU);
-	free_irq( HostAdapter->irq, HostAdapter);
-        scsi_unregister( HostAdapter);
-	continue;
+	goto err_free_irq;
       }	
       
-      if( check_region( cpqfcHBAdata->fcChip.Registers.IOBaseL, 0xff) )
+      if(!request_region( cpqfcHBAdata->fcChip.Registers.IOBaseL, 0xff, DEV_NAME) )
       {
   	printk("  cpqfcTS address in use: %x\n", 
 	      			cpqfcHBAdata->fcChip.Registers.IOBaseL);
-	free_irq( HostAdapter->irq, HostAdapter);
-        scsi_unregister( HostAdapter);
-	continue;
+	goto err_release_register;
       }	
       
-      // OK, we should be able to grab everything we need now.
-      request_region( cpqfcHBAdata->fcChip.Registers.IOBaseL, 0xff, DEV_NAME);
-      request_region( cpqfcHBAdata->fcChip.Registers.IOBaseU, 0xff, DEV_NAME);
       DEBUG_PCI(printk("  Requesting 255 I/O addresses @ %x\n",
         cpqfcHBAdata->fcChip.Registers.IOBaseL ));
       DEBUG_PCI(printk("  Requesting 255 I/O addresses @ %x\n",

@@ -419,6 +417,18 @@
       }
       
       NumberOfAdapters++; 
+      continue;
+
+    err_release_register:
+	release_region(cpqfcHBAdata->fcChip.Registers.IOBaseU, 0xff);
+    err_free_irq:
+	free_irq( HostAdapter->irq, HostAdapter);
+    err_unmap:
+	iounmap(PciDev->base_address[3] & PCI_BASE_ADDRESS_MEM_MASK,
+             0x200);
+    err_unregister:
+        scsi_unregister( HostAdapter);
+
     } // end of while()
   }
 

@@ -707,7 +717,7 @@
  /* we get "vfree: bad address" executing this - need to investigate... 
   if( (void*)((unsigned long)cpqfcHBAdata->fcChip.Registers.MemBase) !=
       cpqfcHBAdata->fcChip.Registers.ReMapMemBase)
-    vfree( cpqfcHBAdata->fcChip.Registers.ReMapMemBase);
+    iounmap( cpqfcHBAdata->fcChip.Registers.ReMapMemBase);
 */
 
   LEAVE("cpqfcTS_release");