From b603fdc462871cea7224d3489ceb1e83fbb12e74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= Date: Mon, 11 Mar 2019 20:33:01 +0200 Subject: device/pci_ops: Rename 'where' to 'reg' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit One could understand 'where' as bus, device, function or register. Make it clear it is register. Change-Id: I95d0330ba40510e48be70ca1d8f58aca66c8f695 Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/c/coreboot/+/31846 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/device/pci_ops_mmconf.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'src/device') diff --git a/src/device/pci_ops_mmconf.c b/src/device/pci_ops_mmconf.c index bfa75cedbc..c7c005caa5 100644 --- a/src/device/pci_ops_mmconf.c +++ b/src/device/pci_ops_mmconf.c @@ -23,43 +23,43 @@ * Functions for accessing PCI configuration space with mmconf accesses */ -#define PCI_MMIO_ADDR(dev, where, mask) \ +#define PCI_MMIO_ADDR(dev, reg, mask) \ ((void *)(((uintptr_t)CONFIG_MMCONF_BASE_ADDRESS |\ (((dev)->bus->secondary & 0xFFF) << 20) |\ (((dev)->path.pci.devfn & 0xFF) << 12) |\ - ((where) & 0xFFF)) & ~mask)) + ((reg) & 0xFFF)) & ~mask)) -static uint8_t pci_mmconf_read_config8(const struct device *dev, uint16_t where) +static uint8_t pci_mmconf_read_config8(const struct device *dev, uint16_t reg) { - return read8(PCI_MMIO_ADDR(dev, where, 0)); + return read8(PCI_MMIO_ADDR(dev, reg, 0)); } -static uint16_t pci_mmconf_read_config16(const struct device *dev, uint16_t where) +static uint16_t pci_mmconf_read_config16(const struct device *dev, uint16_t reg) { - return read16(PCI_MMIO_ADDR(dev, where, 1)); + return read16(PCI_MMIO_ADDR(dev, reg, 1)); } -static uint32_t pci_mmconf_read_config32(const struct device *dev, uint16_t where) +static uint32_t pci_mmconf_read_config32(const struct device *dev, uint16_t reg) { - return read32(PCI_MMIO_ADDR(dev, where, 3)); + return read32(PCI_MMIO_ADDR(dev, reg, 3)); } -static void pci_mmconf_write_config8(const struct device *dev, uint16_t where, +static void pci_mmconf_write_config8(const struct device *dev, uint16_t reg, uint8_t value) { - write8(PCI_MMIO_ADDR(dev, where, 0), value); + write8(PCI_MMIO_ADDR(dev, reg, 0), value); } -static void pci_mmconf_write_config16(const struct device *dev, uint16_t where, +static void pci_mmconf_write_config16(const struct device *dev, uint16_t reg, uint16_t value) { - write16(PCI_MMIO_ADDR(dev, where, 1), value); + write16(PCI_MMIO_ADDR(dev, reg, 1), value); } -static void pci_mmconf_write_config32(const struct device *dev, uint16_t where, +static void pci_mmconf_write_config32(const struct device *dev, uint16_t reg, uint32_t value) { - write32(PCI_MMIO_ADDR(dev, where, 3), value); + write32(PCI_MMIO_ADDR(dev, reg, 3), value); } static const struct pci_bus_operations pci_ops_mmconf = { -- cgit v1.2.3