[SCSI] hpsa: factor out the code to reset controllers on driver load

for kdump support
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

drivers/scsi/hpsa.c

@@ -3571,16 +3571,13 @@ static void __devinit hpsa_hba_inquiry(struct ctlr_info *h)
 	}
 }
 
-static int __devinit hpsa_init_one(struct pci_dev *pdev,
-				    const struct pci_device_id *ent)
+static __devinit int hpsa_init_reset_devices(struct pci_dev *pdev)
 {
-	int i, rc;
-	int dac;
-	struct ctlr_info *h;
+	int i;
+
+	if (!reset_devices)
+		return 0;
 
-	if (number_of_controllers == 0)
-		printk(KERN_INFO DRIVER_NAME "\n");
-	if (reset_devices) {
 	/* Reset the controller with a PCI power-cycle */
 	if (hpsa_hard_reset_controller(pdev) || hpsa_reset_msi(pdev))
 		return -ENODEV;
@@ -3597,7 +3594,21 @@ static int __devinit hpsa_init_one(struct pci_dev *pdev,
 			dev_warn(&pdev->dev, "no-op failed%s\n",
 					(i < 11 ? "; re-trying" : ""));
 	}
-	}
+	return 0;
+}
+
+static int __devinit hpsa_init_one(struct pci_dev *pdev,
+				    const struct pci_device_id *ent)
+{
+	int dac, rc;
+	struct ctlr_info *h;
+
+	if (number_of_controllers == 0)
+		printk(KERN_INFO DRIVER_NAME "\n");
+
+	rc = hpsa_init_reset_devices(pdev);
+	if (rc)
+		return rc;
 
 	/* Command structures must be aligned on a 32-byte boundary because
 	 * the 5 lower bits of the address are used by the hardware. and by