9393
9494#define RCAR_PCI_UNIT_REV_REG (RCAR_AHBPCI_PCICOM_OFFSET + 0x48)
9595
96- struct rcar_pci_priv {
96+ struct rcar_pci {
9797 struct device * dev ;
9898 void __iomem * reg ;
9999 struct resource mem_res ;
@@ -105,7 +105,7 @@ struct rcar_pci_priv {
105105static void __iomem * rcar_pci_cfg_base (struct pci_bus * bus , unsigned int devfn ,
106106 int where )
107107{
108- struct rcar_pci_priv * priv = bus -> sysdata ;
108+ struct rcar_pci * priv = bus -> sysdata ;
109109 int slot , val ;
110110
111111 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,
132132
133133static irqreturn_t rcar_pci_err_irq (int irq , void * pw )
134134{
135- struct rcar_pci_priv * priv = pw ;
135+ struct rcar_pci * priv = pw ;
136136 struct device * dev = priv -> dev ;
137137 u32 status = ioread32 (priv -> reg + RCAR_PCI_INT_STATUS_REG );
138138
@@ -148,7 +148,7 @@ static irqreturn_t rcar_pci_err_irq(int irq, void *pw)
148148 return IRQ_NONE ;
149149}
150150
151- static void rcar_pci_setup_errirq (struct rcar_pci_priv * priv )
151+ static void rcar_pci_setup_errirq (struct rcar_pci * priv )
152152{
153153 struct device * dev = priv -> dev ;
154154 int ret ;
@@ -166,11 +166,11 @@ static void rcar_pci_setup_errirq(struct rcar_pci_priv *priv)
166166 iowrite32 (val , priv -> reg + RCAR_PCI_INT_ENABLE_REG );
167167}
168168#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 ) { }
170170#endif
171171
172172/* 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 )
174174{
175175 struct pci_host_bridge * bridge = pci_host_bridge_from_priv (priv );
176176 struct device * dev = priv -> dev ;
@@ -279,7 +279,7 @@ static int rcar_pci_probe(struct platform_device *pdev)
279279{
280280 struct device * dev = & pdev -> dev ;
281281 struct resource * cfg_res , * mem_res ;
282- struct rcar_pci_priv * priv ;
282+ struct rcar_pci * priv ;
283283 struct pci_host_bridge * bridge ;
284284 void __iomem * reg ;
285285
0 commit comments