[SCSI] hpsa: factor out the code to reset controllers on driver load (4c2a8c40) · Commits · 戴 / test

drivers/scsi/hpsa.c

+30 −19

Original line number	Diff line number	Diff line
		@@ -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,8 +3594,22 @@ 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
		* the driver. See comments in hpsa.h for more info.