diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2019-11-28 08:54:54 -0600 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-11-28 08:54:54 -0600 |
commit | 48617f03c94088780c86692593b0a9b10f74530f (patch) | |
tree | 9e88fc6154a77b5d6871dd4ebc494b7a06c20fe9 /drivers/pci/controller/pci-mvebu.c | |
parent | 7bd4c4a7b0ff94ef01247f905cd568fb67c747e0 (diff) | |
parent | 3c379a59b4795d7279d38c623e74b9790345a32b (diff) | |
download | linux-48617f03c94088780c86692593b0a9b10f74530f.tar.bz2 |
Merge branch 'remotes/lorenzo/pci/misc'
- Fix iproc-msi and mvebu __iomem annotations (Ben Dooks)
- Make mvebu_pci_bridge_emul_ops static (Ben Dooks)
- Add Marek Vasut and Yoshihiro Shimoda as R-Car maintainers (Simon
Horman)
- Fix pcitest.c fd leak (Hewenliang)
* remotes/lorenzo/pci/misc:
tools: PCI: Fix fd leakage
MAINTAINERS: Add Marek and Shimoda-san as R-Car PCIE co-maintainers
PCI: mvebu: mvebu_pcie_map_registers __iomem fix
PCI: mvebu: Make mvebu_pci_bridge_emul_ops static
PCI: iproc-msi: Fix __iomem annotation in decode_msi_hwirq()
Diffstat (limited to 'drivers/pci/controller/pci-mvebu.c')
-rw-r--r-- | drivers/pci/controller/pci-mvebu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/controller/pci-mvebu.c b/drivers/pci/controller/pci-mvebu.c index d3a0419e42f2..153a64676bc9 100644 --- a/drivers/pci/controller/pci-mvebu.c +++ b/drivers/pci/controller/pci-mvebu.c @@ -554,7 +554,7 @@ mvebu_pci_bridge_emul_pcie_conf_write(struct pci_bridge_emul *bridge, } } -struct pci_bridge_emul_ops mvebu_pci_bridge_emul_ops = { +static struct pci_bridge_emul_ops mvebu_pci_bridge_emul_ops = { .write_base = mvebu_pci_bridge_emul_base_conf_write, .read_pcie = mvebu_pci_bridge_emul_pcie_conf_read, .write_pcie = mvebu_pci_bridge_emul_pcie_conf_write, @@ -713,7 +713,7 @@ static void __iomem *mvebu_pcie_map_registers(struct platform_device *pdev, ret = of_address_to_resource(np, 0, ®s); if (ret) - return ERR_PTR(ret); + return (void __iomem *)ERR_PTR(ret); return devm_ioremap_resource(&pdev->dev, ®s); } |