[coreboot-gerrit] Patch set updated for coreboot: PCI ops: Rename pci_mmio_xx() to pcie_xx()

[Kyösti Mälkki (kyosti.malkki@gmail.com)]

Kyösti Mälkki (kyosti.malkki at gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17530

-gerrit

commit 3f367b437ca3aa4b9d7d58548bee77c3f0df6252
Author: Kyösti Mälkki <kyosti.malkki at gmail.com>
Date:   Sun Oct 27 14:59:00 2013 +0200

    PCI ops: Rename pci_mmio_xx() to pcie_xx()
    
    Change-Id: I7fa65197b8165b9b0b74937f9ba455c48308da37
    Signed-off-by: Kyösti Mälkki <kyosti.malkki at gmail.com>
---
 src/arch/x86/include/arch/pci_mmio_cfg.h |  8 --------
 src/device/pci_ops.c                     | 12 ++++++------
 src/include/device/pci_ops.h             | 12 ++++++------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/arch/x86/include/arch/pci_mmio_cfg.h b/src/arch/x86/include/arch/pci_mmio_cfg.h
index 25cdae9..966a221 100644
--- a/src/arch/x86/include/arch/pci_mmio_cfg.h
+++ b/src/arch/x86/include/arch/pci_mmio_cfg.h
@@ -90,14 +90,6 @@ void pcie_or_config32(pci_devfn_t dev, unsigned int where, u32 ormask)
 	pcie_write_config32(dev, where, value | ormask);
 }
 
-#define pci_mmio_read_config8 	pcie_read_config8
-#define pci_mmio_read_config16	pcie_read_config16
-#define pci_mmio_read_config32	pcie_read_config32
-
-#define pci_mmio_write_config8 	pcie_write_config8
-#define pci_mmio_write_config16	pcie_write_config16
-#define pci_mmio_write_config32	pcie_write_config32
-
 #if CONFIG_MMCONF_SUPPORT_DEFAULT
 #define pci_read_config8 	pcie_read_config8
 #define pci_read_config16	pcie_read_config16
diff --git a/src/device/pci_ops.c b/src/device/pci_ops.c
index ab72405..e1fd168 100644
--- a/src/device/pci_ops.c
+++ b/src/device/pci_ops.c
@@ -120,42 +120,42 @@ void pci_write_config32(struct device *dev, unsigned int where, u32 val)
 }
 
 #if CONFIG_MMCONF_SUPPORT
-u8 pci_mmio_read_config8(struct device *dev, unsigned int where)
+u8 pcie_read_config8(struct device *dev, unsigned int where)
 {
 	struct bus *pbus = get_pbus(dev);
 	return pci_ops_mmconf.read8(pbus, dev->bus->secondary,
 				    dev->path.pci.devfn, where);
 }
 
-u16 pci_mmio_read_config16(struct device *dev, unsigned int where)
+u16 pcie_read_config16(struct device *dev, unsigned int where)
 {
 	struct bus *pbus = get_pbus(dev);
 	return pci_ops_mmconf.read16(pbus, dev->bus->secondary,
 				     dev->path.pci.devfn, where);
 }
 
-u32 pci_mmio_read_config32(struct device *dev, unsigned int where)
+u32 pcie_read_config32(struct device *dev, unsigned int where)
 {
 	struct bus *pbus = get_pbus(dev);
 	return pci_ops_mmconf.read32(pbus, dev->bus->secondary,
 				     dev->path.pci.devfn, where);
 }
 
-void pci_mmio_write_config8(struct device *dev, unsigned int where, u8 val)
+void pcie_write_config8(struct device *dev, unsigned int where, u8 val)
 {
 	struct bus *pbus = get_pbus(dev);
 	pci_ops_mmconf.write8(pbus, dev->bus->secondary, dev->path.pci.devfn,
 			      where, val);
 }
 
-void pci_mmio_write_config16(struct device *dev, unsigned int where, u16 val)
+void pcie_write_config16(struct device *dev, unsigned int where, u16 val)
 {
 	struct bus *pbus = get_pbus(dev);
 	pci_ops_mmconf.write16(pbus, dev->bus->secondary, dev->path.pci.devfn,
 			       where, val);
 }
 
-void pci_mmio_write_config32(struct device *dev, unsigned int where, u32 val)
+void pcie_write_config32(struct device *dev, unsigned int where, u32 val)
 {
 	struct bus *pbus = get_pbus(dev);
 	pci_ops_mmconf.write32(pbus, dev->bus->secondary, dev->path.pci.devfn,
diff --git a/src/include/device/pci_ops.h b/src/include/device/pci_ops.h
index 920475a..13b046e 100644
--- a/src/include/device/pci_ops.h
+++ b/src/include/device/pci_ops.h
@@ -14,12 +14,12 @@ void pci_write_config16(struct device *dev, unsigned int where, u16 val);
 void pci_write_config32(struct device *dev, unsigned int where, u32 val);
 
 #if CONFIG_MMCONF_SUPPORT
-u8 pci_mmio_read_config8(struct device *dev, unsigned int where);
-u16 pci_mmio_read_config16(struct device *dev, unsigned int where);
-u32 pci_mmio_read_config32(struct device *dev, unsigned int where);
-void pci_mmio_write_config8(struct device *dev, unsigned int where, u8 val);
-void pci_mmio_write_config16(struct device *dev, unsigned int where, u16 val);
-void pci_mmio_write_config32(struct device *dev, unsigned int where, u32 val);
+u8 pcie_read_config8(struct device *dev, unsigned int where);
+u16 pcie_read_config16(struct device *dev, unsigned int where);
+u32 pcie_read_config32(struct device *dev, unsigned int where);
+void pcie_write_config8(struct device *dev, unsigned int where, u8 val);
+void pcie_write_config16(struct device *dev, unsigned int where, u16 val);
+void pcie_write_config32(struct device *dev, unsigned int where, u32 val);
 #endif
 #endif