device/pci_ops: Rename 'where' to 'reg'

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 <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31846
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>

3 files changed, 54 insertions, 54 deletions

diff --git a/src/include/device/pci.h b/src/include/device/pci.h
index aa2dd99685d7..2cfcb602442f 100644
--- a/src/include/device/pci.h
+++ b/src/include/device/pci.h
@@ -35,12 +35,12 @@ struct pci_operations {
 
 /* Common pci bus operations */
 struct pci_bus_operations {
-	uint8_t   (*read8)(const struct device *dev, uint16_t where);
-	uint16_t (*read16)(const struct device *dev, uint16_t where);
-	uint32_t (*read32)(const struct device *dev, uint16_t where);
-	void     (*write8)(const struct device *dev, uint16_t where, uint8_t val);
-	void    (*write16)(const struct device *dev, uint16_t where, uint16_t val);
-	void    (*write32)(const struct device *dev, uint16_t where, uint32_t val);
+	uint8_t   (*read8)(const struct device *dev, uint16_t reg);
+	uint16_t (*read16)(const struct device *dev, uint16_t reg);
+	uint32_t (*read32)(const struct device *dev, uint16_t reg);
+	void     (*write8)(const struct device *dev, uint16_t reg, uint8_t val);
+	void    (*write16)(const struct device *dev, uint16_t reg, uint16_t val);
+	void    (*write32)(const struct device *dev, uint16_t reg, uint32_t val);
 };
 
 struct pci_driver {
diff --git a/src/include/device/pci_mmio_cfg.h b/src/include/device/pci_mmio_cfg.h
index 64406a728e17..e7019151aa8a 100644
--- a/src/include/device/pci_mmio_cfg.h
+++ b/src/include/device/pci_mmio_cfg.h
@@ -22,50 +22,50 @@
 
 
 static __always_inline
-uint8_t pci_mmio_read_config8(pci_devfn_t dev, uint16_t where)
+uint8_t pci_mmio_read_config8(pci_devfn_t dev, uint16_t reg)
 {
 	void *addr;
-	addr = (void *)(uintptr_t)(CONFIG_MMCONF_BASE_ADDRESS | dev | where);
+	addr = (void *)(uintptr_t)(CONFIG_MMCONF_BASE_ADDRESS | dev | reg);
 	return read8(addr);
 }
 
 static __always_inline
-uint16_t pci_mmio_read_config16(pci_devfn_t dev, uint16_t where)
+uint16_t pci_mmio_read_config16(pci_devfn_t dev, uint16_t reg)
 {
 	void *addr;
-	addr = (void *)(uintptr_t)(CONFIG_MMCONF_BASE_ADDRESS | dev | (where & ~1));
+	addr = (void *)(uintptr_t)(CONFIG_MMCONF_BASE_ADDRESS | dev | (reg & ~1));
 	return read16(addr);
 }
 
 static __always_inline
-uint32_t pci_mmio_read_config32(pci_devfn_t dev, uint16_t where)
+uint32_t pci_mmio_read_config32(pci_devfn_t dev, uint16_t reg)
 {
 	void *addr;
-	addr = (void *)(uintptr_t)(CONFIG_MMCONF_BASE_ADDRESS | dev | (where & ~3));
+	addr = (void *)(uintptr_t)(CONFIG_MMCONF_BASE_ADDRESS | dev | (reg & ~3));
 	return read32(addr);
 }
 
 static __always_inline
-void pci_mmio_write_config8(pci_devfn_t dev, uint16_t where, uint8_t value)
+void pci_mmio_write_config8(pci_devfn_t dev, uint16_t reg, uint8_t value)
 {
 	void *addr;
-	addr = (void *)(uintptr_t)(CONFIG_MMCONF_BASE_ADDRESS | dev | where);
+	addr = (void *)(uintptr_t)(CONFIG_MMCONF_BASE_ADDRESS | dev | reg);
 	write8(addr, value);
 }
 
 static __always_inline
-void pci_mmio_write_config16(pci_devfn_t dev, uint16_t where, uint16_t value)
+void pci_mmio_write_config16(pci_devfn_t dev, uint16_t reg, uint16_t value)
 {
 	void *addr;
-	addr = (void *)(uintptr_t)(CONFIG_MMCONF_BASE_ADDRESS | dev | (where & ~1));
+	addr = (void *)(uintptr_t)(CONFIG_MMCONF_BASE_ADDRESS | dev | (reg & ~1));
 	write16(addr, value);
 }
 
 static __always_inline
-void pci_mmio_write_config32(pci_devfn_t dev, uint16_t where, uint32_t value)
+void pci_mmio_write_config32(pci_devfn_t dev, uint16_t reg, uint32_t value)
 {
 	void *addr;
-	addr = (void *)(uintptr_t)(CONFIG_MMCONF_BASE_ADDRESS | dev | (where & ~3));
+	addr = (void *)(uintptr_t)(CONFIG_MMCONF_BASE_ADDRESS | dev | (reg & ~3));
 	write32(addr, value);
 }
 
@@ -77,39 +77,39 @@ void pci_mmio_write_config32(pci_devfn_t dev, uint16_t where, uint32_t value)
  */
 
 static __always_inline
-uint8_t pci_s_read_config8(pci_devfn_t dev, uint16_t where)
+uint8_t pci_s_read_config8(pci_devfn_t dev, uint16_t reg)
 {
-	return pci_mmio_read_config8(dev, where);
+	return pci_mmio_read_config8(dev, reg);
 }
 
 static __always_inline
-uint16_t pci_s_read_config16(pci_devfn_t dev, uint16_t where)
+uint16_t pci_s_read_config16(pci_devfn_t dev, uint16_t reg)
 {
-	return pci_mmio_read_config16(dev, where);
+	return pci_mmio_read_config16(dev, reg);
 }
 
 static __always_inline
-uint32_t pci_s_read_config32(pci_devfn_t dev, uint16_t where)
+uint32_t pci_s_read_config32(pci_devfn_t dev, uint16_t reg)
 {
-	return pci_mmio_read_config32(dev, where);
+	return pci_mmio_read_config32(dev, reg);
 }
 
 static __always_inline
-void pci_s_write_config8(pci_devfn_t dev, uint16_t where, uint8_t value)
+void pci_s_write_config8(pci_devfn_t dev, uint16_t reg, uint8_t value)
 {
-	pci_mmio_write_config8(dev, where, value);
+	pci_mmio_write_config8(dev, reg, value);
 }
 
 static __always_inline
-void pci_s_write_config16(pci_devfn_t dev, uint16_t where, uint16_t value)
+void pci_s_write_config16(pci_devfn_t dev, uint16_t reg, uint16_t value)
 {
-	pci_mmio_write_config16(dev, where, value);
+	pci_mmio_write_config16(dev, reg, value);
 }
 
 static __always_inline
-void pci_s_write_config32(pci_devfn_t dev, uint16_t where, uint32_t value)
+void pci_s_write_config32(pci_devfn_t dev, uint16_t reg, uint32_t value)
 {
-	pci_mmio_write_config32(dev, where, value);
+	pci_mmio_write_config32(dev, reg, value);
 }
 
 #endif
diff --git a/src/include/device/pci_ops.h b/src/include/device/pci_ops.h
index 618e3a1cbd9e..82f96584de60 100644
--- a/src/include/device/pci_ops.h
+++ b/src/include/device/pci_ops.h
@@ -55,83 +55,83 @@ static __always_inline void pcidev_assert(const struct device *dev)
 }
 
 static __always_inline
-u8 pci_read_config8(const struct device *dev, u16 where)
+u8 pci_read_config8(const struct device *dev, u16 reg)
 {
 	pcidev_assert(dev);
-	return pci_bus_ops()->read8(dev, where);
+	return pci_bus_ops()->read8(dev, reg);
 }
 
 static __always_inline
-u16 pci_read_config16(const struct device *dev, u16 where)
+u16 pci_read_config16(const struct device *dev, u16 reg)
 {
 	pcidev_assert(dev);
-	return pci_bus_ops()->read16(dev, where);
+	return pci_bus_ops()->read16(dev, reg);
 }
 
 static __always_inline
-u32 pci_read_config32(const struct device *dev, u16 where)
+u32 pci_read_config32(const struct device *dev, u16 reg)
 {
 	pcidev_assert(dev);
-	return pci_bus_ops()->read32(dev, where);
+	return pci_bus_ops()->read32(dev, reg);
 }
 
 static __always_inline
-void pci_write_config8(const struct device *dev, u16 where, u8 val)
+void pci_write_config8(const struct device *dev, u16 reg, u8 val)
 {
 	pcidev_assert(dev);
-	pci_bus_ops()->write8(dev, where, val);
+	pci_bus_ops()->write8(dev, reg, val);
 }
 
 static __always_inline
-void pci_write_config16(const struct device *dev, u16 where, u16 val)
+void pci_write_config16(const struct device *dev, u16 reg, u16 val)
 {
 	pcidev_assert(dev);
-	pci_bus_ops()->write16(dev, where, val);
+	pci_bus_ops()->write16(dev, reg, val);
 }
 
 static __always_inline
-void pci_write_config32(const struct device *dev, u16 where, u32 val)
+void pci_write_config32(const struct device *dev, u16 reg, u32 val)
 {
 	pcidev_assert(dev);
-	pci_bus_ops()->write32(dev, where, val);
+	pci_bus_ops()->write32(dev, reg, val);
 }
 
 #endif
 
 #ifdef __SIMPLE_DEVICE__
 static __always_inline
-void pci_or_config8(pci_devfn_t dev, u16 where, u8 ormask)
+void pci_or_config8(pci_devfn_t dev, u16 reg, u8 ormask)
 #else
 static __always_inline
-void pci_or_config8(const struct device *dev, u16 where, u8 ormask)
+void pci_or_config8(const struct device *dev, u16 reg, u8 ormask)
 #endif
 {
-	u8 value = pci_read_config8(dev, where);
-	pci_write_config8(dev, where, value | ormask);
+	u8 value = pci_read_config8(dev, reg);
+	pci_write_config8(dev, reg, value | ormask);
 }
 
 #ifdef __SIMPLE_DEVICE__
 static __always_inline
-void pci_or_config16(pci_devfn_t dev, u16 where, u16 ormask)
+void pci_or_config16(pci_devfn_t dev, u16 reg, u16 ormask)
 #else
 static __always_inline
-void pci_or_config16(const struct device *dev, u16 where, u16 ormask)
+void pci_or_config16(const struct device *dev, u16 reg, u16 ormask)
 #endif
 {
-	u16 value = pci_read_config16(dev, where);
-	pci_write_config16(dev, where, value | ormask);
+	u16 value = pci_read_config16(dev, reg);
+	pci_write_config16(dev, reg, value | ormask);
 }
 
 #ifdef __SIMPLE_DEVICE__
 static __always_inline
-void pci_or_config32(pci_devfn_t dev, u16 where, u32 ormask)
+void pci_or_config32(pci_devfn_t dev, u16 reg, u32 ormask)
 #else
 static __always_inline
-void pci_or_config32(const struct device *dev, u16 where, u32 ormask)
+void pci_or_config32(const struct device *dev, u16 reg, u32 ormask)
 #endif
 {
-	u32 value = pci_read_config32(dev, where);
-	pci_write_config32(dev, where, value | ormask);
+	u32 value = pci_read_config32(dev, reg);
+	pci_write_config32(dev, reg, value | ormask);
 }
 
 #ifdef __SIMPLE_DEVICE__