Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PCI: rcar-gen2: Rename rcar_pci_priv to rcar_pci

Rename struct rcar_pci_priv to rcar_pci to match the convention of
<driver>_pci. No functional change intended.

Link: https://lore.kernel.org/r/20211223011054.1227810-19-helgaas@kernel.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

+7 -7
+7 -7
drivers/pci/controller/pci-rcar-gen2.c
··· 93 93 94 94 #define RCAR_PCI_UNIT_REV_REG (RCAR_AHBPCI_PCICOM_OFFSET + 0x48) 95 95 96 - struct rcar_pci_priv { 96 + struct rcar_pci { 97 97 struct device *dev; 98 98 void __iomem *reg; 99 99 struct resource mem_res; ··· 105 105 static void __iomem *rcar_pci_cfg_base(struct pci_bus *bus, unsigned int devfn, 106 106 int where) 107 107 { 108 - struct rcar_pci_priv *priv = bus->sysdata; 108 + struct rcar_pci *priv = bus->sysdata; 109 109 int slot, val; 110 110 111 111 if (!pci_is_root_bus(bus) || PCI_FUNC(devfn)) ··· 132 132 133 133 static irqreturn_t rcar_pci_err_irq(int irq, void *pw) 134 134 { 135 - struct rcar_pci_priv *priv = pw; 135 + struct rcar_pci *priv = pw; 136 136 struct device *dev = priv->dev; 137 137 u32 status = ioread32(priv->reg + RCAR_PCI_INT_STATUS_REG); 138 138 ··· 148 148 return IRQ_NONE; 149 149 } 150 150 151 - static void rcar_pci_setup_errirq(struct rcar_pci_priv *priv) 151 + static void rcar_pci_setup_errirq(struct rcar_pci *priv) 152 152 { 153 153 struct device *dev = priv->dev; 154 154 int ret; ··· 166 166 iowrite32(val, priv->reg + RCAR_PCI_INT_ENABLE_REG); 167 167 } 168 168 #else 169 - static inline void rcar_pci_setup_errirq(struct rcar_pci_priv *priv) { } 169 + static inline void rcar_pci_setup_errirq(struct rcar_pci *priv) { } 170 170 #endif 171 171 172 172 /* PCI host controller setup */ 173 - static void rcar_pci_setup(struct rcar_pci_priv *priv) 173 + static void rcar_pci_setup(struct rcar_pci *priv) 174 174 { 175 175 struct pci_host_bridge *bridge = pci_host_bridge_from_priv(priv); 176 176 struct device *dev = priv->dev; ··· 279 279 { 280 280 struct device *dev = &pdev->dev; 281 281 struct resource *cfg_res, *mem_res; 282 - struct rcar_pci_priv *priv; 282 + struct rcar_pci *priv; 283 283 struct pci_host_bridge *bridge; 284 284 void __iomem *reg; 285 285