diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2019-11-28 17:54:54 +0300 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2019-11-28 17:54:54 +0300 |
| commit | 48617f03c94088780c86692593b0a9b10f74530f (patch) | |
| tree | 9e88fc6154a77b5d6871dd4ebc494b7a06c20fe9 | |
| parent | 7bd4c4a7b0ff94ef01247f905cd568fb67c747e0 (diff) | |
| parent | 3c379a59b4795d7279d38c623e74b9790345a32b (diff) | |
| download | linux-48617f03c94088780c86692593b0a9b10f74530f.tar.xz | |
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()
| -rw-r--r-- | MAINTAINERS | 3 | ||||
| -rw-r--r-- | drivers/pci/controller/pci-mvebu.c | 4 | ||||
| -rw-r--r-- | drivers/pci/controller/pcie-iproc-msi.c | 5 | ||||
| -rw-r--r-- | tools/pci/pcitest.c | 1 |
4 files changed, 8 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 165d9a252bb9..182d15c63d54 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -12489,7 +12489,8 @@ F: Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt F: drivers/pci/controller/pci-tegra.c PCI DRIVER FOR RENESAS R-CAR -M: Simon Horman <horms@verge.net.au> +M: Marek Vasut <marek.vasut+renesas@gmail.com> +M: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> L: linux-pci@vger.kernel.org L: linux-renesas-soc@vger.kernel.org S: Maintained 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); } diff --git a/drivers/pci/controller/pcie-iproc-msi.c b/drivers/pci/controller/pcie-iproc-msi.c index 0a3f61be5625..3176ad3ab0e5 100644 --- a/drivers/pci/controller/pcie-iproc-msi.c +++ b/drivers/pci/controller/pcie-iproc-msi.c @@ -293,11 +293,12 @@ static const struct irq_domain_ops msi_domain_ops = { static inline u32 decode_msi_hwirq(struct iproc_msi *msi, u32 eq, u32 head) { - u32 *msg, hwirq; + u32 __iomem *msg; + u32 hwirq; unsigned int offs; offs = iproc_msi_eq_offset(msi, eq) + head * sizeof(u32); - msg = (u32 *)(msi->eq_cpu + offs); + msg = (u32 __iomem *)(msi->eq_cpu + offs); hwirq = readl(msg); hwirq = (hwirq >> 5) + (hwirq & 0x1f); diff --git a/tools/pci/pcitest.c b/tools/pci/pcitest.c index cb1e51fcc84e..32b7c6f9043d 100644 --- a/tools/pci/pcitest.c +++ b/tools/pci/pcitest.c @@ -129,6 +129,7 @@ static int run_test(struct pci_test *test) } fflush(stdout); + close(fd); return (ret < 0) ? ret : 1 - ret; /* return 0 if test succeeded */ } |