summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2021-07-06 10:56:28 -0500
committerBjorn Helgaas <bhelgaas@google.com>2021-07-06 10:56:28 -0500
commit5e0716fc26a2dd0caf9e8d838c2e83f5f0c70b75 (patch)
tree6f42fc59ee36cc530f57b52d6b686077dac6e085
parent5a57de58a3d1ebc9a3dc106b0e7007c3ccbf052f (diff)
parent662e4b03431f5304603f1e42c4d4c2c1d64cba40 (diff)
Merge branch 'pci/host/xgene'
- Annotate __iomem pointer (Bjorn Helgaas) * pci/host/xgene: PCI: xgene: Annotate __iomem pointer
-rw-r--r--drivers/pci/controller/pci-xgene.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/controller/pci-xgene.c b/drivers/pci/controller/pci-xgene.c
index 7f503dd4ff81..1a412f5377fb 100644
--- 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;