[SCSI] hpsa: factor out hpsa_find_memory_BAR
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 66b7dcf..0582f2f 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -3285,6 +3285,23 @@
return ((command & PCI_COMMAND_MEMORY) == 0);
}
+static int __devinit hpsa_pci_find_memory_BAR(struct ctlr_info *h,
+ unsigned long *memory_bar)
+{
+ int i;
+
+ for (i = 0; i < DEVICE_COUNT_RESOURCE; i++)
+ if (pci_resource_flags(h->pdev, i) & IORESOURCE_MEM) {
+ /* addressing mode bits already removed */
+ *memory_bar = pci_resource_start(h->pdev, i);
+ dev_dbg(&h->pdev->dev, "memory BAR = %lx\n",
+ *memory_bar);
+ return 0;
+ }
+ dev_warn(&h->pdev->dev, "no memory BAR found\n");
+ return -ENODEV;
+}
+
static int __devinit hpsa_pci_init(struct ctlr_info *h)
{
u32 scratchpad = 0;
@@ -3317,22 +3334,9 @@
return err;
}
hpsa_interrupt_mode(h);
-
- /* find the memory BAR */
- for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
- if (pci_resource_flags(h->pdev, i) & IORESOURCE_MEM)
- break;
- }
- if (i == DEVICE_COUNT_RESOURCE) {
- dev_warn(&h->pdev->dev, "no memory BAR found\n");
- err = -ENODEV;
+ err = hpsa_pci_find_memory_BAR(h, &h->paddr);
+ if (err)
goto err_out_free_res;
- }
-
- h->paddr = pci_resource_start(h->pdev, i); /* addressing mode bits
- * already removed
- */
-
h->vaddr = remap_pci_mem(h->paddr, 0x250);
/* Wait for the board to become ready. */
