提交 7025ecb6 编写于 作者: B Bjorn Helgaas

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.orgSigned-off-by: NBjorn Helgaas <bhelgaas@google.com>
Cc: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
上级 4793895f
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
#define RCAR_PCI_UNIT_REV_REG (RCAR_AHBPCI_PCICOM_OFFSET + 0x48) #define RCAR_PCI_UNIT_REV_REG (RCAR_AHBPCI_PCICOM_OFFSET + 0x48)
struct rcar_pci_priv { struct rcar_pci {
struct device *dev; struct device *dev;
void __iomem *reg; void __iomem *reg;
struct resource mem_res; struct resource mem_res;
...@@ -105,7 +105,7 @@ struct rcar_pci_priv { ...@@ -105,7 +105,7 @@ struct rcar_pci_priv {
static void __iomem *rcar_pci_cfg_base(struct pci_bus *bus, unsigned int devfn, static void __iomem *rcar_pci_cfg_base(struct pci_bus *bus, unsigned int devfn,
int where) int where)
{ {
struct rcar_pci_priv *priv = bus->sysdata; struct rcar_pci *priv = bus->sysdata;
int slot, val; int slot, val;
if (!pci_is_root_bus(bus) || PCI_FUNC(devfn)) if (!pci_is_root_bus(bus) || PCI_FUNC(devfn))
...@@ -132,7 +132,7 @@ static void __iomem *rcar_pci_cfg_base(struct pci_bus *bus, unsigned int devfn, ...@@ -132,7 +132,7 @@ static void __iomem *rcar_pci_cfg_base(struct pci_bus *bus, unsigned int devfn,
static irqreturn_t rcar_pci_err_irq(int irq, void *pw) static irqreturn_t rcar_pci_err_irq(int irq, void *pw)
{ {
struct rcar_pci_priv *priv = pw; struct rcar_pci *priv = pw;
struct device *dev = priv->dev; struct device *dev = priv->dev;
u32 status = ioread32(priv->reg + RCAR_PCI_INT_STATUS_REG); u32 status = ioread32(priv->reg + RCAR_PCI_INT_STATUS_REG);
...@@ -148,7 +148,7 @@ static irqreturn_t rcar_pci_err_irq(int irq, void *pw) ...@@ -148,7 +148,7 @@ static irqreturn_t rcar_pci_err_irq(int irq, void *pw)
return IRQ_NONE; return IRQ_NONE;
} }
static void rcar_pci_setup_errirq(struct rcar_pci_priv *priv) static void rcar_pci_setup_errirq(struct rcar_pci *priv)
{ {
struct device *dev = priv->dev; struct device *dev = priv->dev;
int ret; int ret;
...@@ -166,11 +166,11 @@ static void rcar_pci_setup_errirq(struct rcar_pci_priv *priv) ...@@ -166,11 +166,11 @@ static void rcar_pci_setup_errirq(struct rcar_pci_priv *priv)
iowrite32(val, priv->reg + RCAR_PCI_INT_ENABLE_REG); iowrite32(val, priv->reg + RCAR_PCI_INT_ENABLE_REG);
} }
#else #else
static inline void rcar_pci_setup_errirq(struct rcar_pci_priv *priv) { } static inline void rcar_pci_setup_errirq(struct rcar_pci *priv) { }
#endif #endif
/* PCI host controller setup */ /* PCI host controller setup */
static void rcar_pci_setup(struct rcar_pci_priv *priv) static void rcar_pci_setup(struct rcar_pci *priv)
{ {
struct pci_host_bridge *bridge = pci_host_bridge_from_priv(priv); struct pci_host_bridge *bridge = pci_host_bridge_from_priv(priv);
struct device *dev = priv->dev; struct device *dev = priv->dev;
...@@ -279,7 +279,7 @@ static int rcar_pci_probe(struct platform_device *pdev) ...@@ -279,7 +279,7 @@ static int rcar_pci_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct resource *cfg_res, *mem_res; struct resource *cfg_res, *mem_res;
struct rcar_pci_priv *priv; struct rcar_pci *priv;
struct pci_host_bridge *bridge; struct pci_host_bridge *bridge;
void __iomem *reg; void __iomem *reg;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册