[flashrom] [PATCH] fixup! Add pci_init_common() to unify PCI init.

Stefan Tauner stefan.tauner at student.tuwien.ac.at
Mon Dec 31 22:24:46 CET 2012


oops. forgot to save after renaming the method :)

Signed-off-by: Stefan Tauner <stefan.tauner at student.tuwien.ac.at>
---
 pcidev.c     |    4 ++--
 programmer.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pcidev.c b/pcidev.c
index 7f1f243..a5a7088 100644
--- a/pcidev.c
+++ b/pcidev.c
@@ -162,7 +162,7 @@ static int pcidev_shutdown(void *data)
 	return 0;
 }
 
-int pcidev_init_common(void)
+int pci_init_common(void)
 {
 	pacc = pci_alloc();     /* Get the pci_access structure */
 	pci_init(pacc);         /* Initialize the PCI library */
@@ -182,7 +182,7 @@ uintptr_t pcidev_init(int bar, const struct dev_entry *devs)
 	int i;
 	uintptr_t addr = 0, curaddr = 0;
 
-	if(pcidev_init_common() != 0)
+	if(pci_init_common() != 0)
 		return 1;
 	pci_filter_init(pacc, &filter);
 
diff --git a/programmer.h b/programmer.h
index 5cbf289..77b78bd 100644
--- a/programmer.h
+++ b/programmer.h
@@ -238,7 +238,7 @@ void internal_delay(int usecs);
 extern uint32_t io_base_addr;
 extern struct pci_access *pacc;
 extern struct pci_dev *pcidev_dev;
-int pcidev_init_common(void);
+int pci_init_common(void);
 uintptr_t pcidev_readbar(struct pci_dev *dev, int bar);
 uintptr_t pcidev_init(int bar, const struct dev_entry *devs);
 /* rpci_write_* are reversible writes. The original PCI config space register
-- 
Kind regards, Stefan Tauner





More information about the flashrom mailing list