Merge branch 'pci/host/xgene'

bjorn-helgaas · bjorn-helgaas · commit 5e0716fc26a2 · 2021-07-06T10:56:28.000-05:00
- Annotate __iomem pointer (Bjorn Helgaas)

* pci/host/xgene:
  PCI: xgene: Annotate __iomem pointer
diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
@@ -485,7 +485,7 @@ static void xgene_pcie_setup_ib_reg(struct xgene_pcie_port *port,
 {
 	void __iomem *cfg_base = port->cfg_base;
 	struct device *dev = port->dev;
-	void *bar_addr;
+	void __iomem *bar_addr;
 	u32 pim_reg;
 	u64 cpu_addr = entry->res->start;
 	u64 pci_addr = cpu_addr - entry->offset;

Original file line number	Diff line number	Diff line change
`@@ -485,7 +485,7 @@ static void xgene_pcie_setup_ib_reg(struct xgene_pcie_port *port,`
`485`	`485`	`{`
`486`	`486`	`void __iomem *cfg_base = port->cfg_base;`
`487`	`487`	`struct device *dev = port->dev;`
`488`		`- void *bar_addr;`
	`488`	`+ void __iomem *bar_addr;`
`489`	`489`	`u32 pim_reg;`
`490`	`490`	`u64 cpu_addr = entry->res->start;`
`491`	`491`	`u64 pci_addr = cpu_addr - entry->offset;`