lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
for kdump support

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
This commit is contained in:
Stephen M. Cameron
2010-06-16 13:51:35 -05:00
committed by James Bottomley
parent a51fd47f1b
commit 4c2a8c40d8
1 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/scsi/hpsa.c
View File

@@ -3571,16 +3571,13 @@ static void __devinit hpsa_hba_inquiry(struct ctlr_info *h)
} }
} }
static int __devinit hpsa_init_one(struct pci_dev *pdev, static __devinit int hpsa_init_reset_devices(struct pci_dev *pdev)
const struct pci_device_id *ent)
{ {
int i, rc; int i;
int dac;
struct ctlr_info *h; 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 */ /* Reset the controller with a PCI power-cycle */
if (hpsa_hard_reset_controller(pdev) || hpsa_reset_msi(pdev)) if (hpsa_hard_reset_controller(pdev) || hpsa_reset_msi(pdev))
return -ENODEV; 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", dev_warn(&pdev->dev, "no-op failed%s\n",
(i < 11 ? "; re-trying" : "")); (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 /* 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 5 lower bits of the address are used by the hardware. and by
* the driver. See comments in hpsa.h for more info. * the driver. See comments in hpsa.h for more info.