From c447c039b29c1fc685cc6ba274cbe97684d11a77 Mon Sep 17 00:00:00 2001 From: "Stephen M. Cameron" Date: Wed, 16 Jun 2010 13:51:25 -0500 Subject: [PATCH] --- yaml --- r: 204129 b: refs/heads/master c: 12d2cd4711b9e3ddcf911281ec4fe511b5cfff63 h: refs/heads/master i: 204127: aa9d0ee83d55661bf627b37e0126d1963f6fd17f v: v3 --- [refs] | 2 +- trunk/drivers/scsi/hpsa.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 80967eebccc4..830a7bf103e8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6798cc0a4964ceabc27de762c41929f8a875e3fd +refs/heads/master: 12d2cd4711b9e3ddcf911281ec4fe511b5cfff63 diff --git a/trunk/drivers/scsi/hpsa.c b/trunk/drivers/scsi/hpsa.c index 25faaae324a3..f5305a4b8b32 100644 --- a/trunk/drivers/scsi/hpsa.c +++ b/trunk/drivers/scsi/hpsa.c @@ -3313,20 +3313,20 @@ static inline bool hpsa_board_disabled(struct pci_dev *pdev) return ((command & PCI_COMMAND_MEMORY) == 0); } -static int __devinit hpsa_pci_find_memory_BAR(struct ctlr_info *h, +static int __devinit hpsa_pci_find_memory_BAR(struct pci_dev *pdev, unsigned long *memory_bar) { int i; for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) - if (pci_resource_flags(h->pdev, i) & IORESOURCE_MEM) { + if (pci_resource_flags(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 = pci_resource_start(pdev, i); + dev_dbg(&pdev->dev, "memory BAR = %lx\n", *memory_bar); return 0; } - dev_warn(&h->pdev->dev, "no memory BAR found\n"); + dev_warn(&pdev->dev, "no memory BAR found\n"); return -ENODEV; } @@ -3503,7 +3503,7 @@ static int __devinit hpsa_pci_init(struct ctlr_info *h) return err; } hpsa_interrupt_mode(h); - err = hpsa_pci_find_memory_BAR(h, &h->paddr); + err = hpsa_pci_find_memory_BAR(h->pdev, &h->paddr); if (err) goto err_out_free_res; h->vaddr = remap_pci_mem(h->paddr, 0x250);