| From bd3a7f225bd4d7278fcbb9d041109e635754c76c Mon Sep 17 00:00:00 2001 |
| From: Phil Edworthy <phil.edworthy@renesas.com> |
| Date: Mon, 30 Jun 2014 09:37:01 +0100 |
| Subject: PCI: rcar: Remove rcar_pcie_setup_window() resource argument |
| |
| rcar_pcie_setup_window() took both the window number and the resource, |
| which was redundant because we can look up the resource from the window |
| number. |
| |
| Remove the "res" argument. |
| |
| Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com> |
| Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> |
| Acked-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 0549252a1da98c5c39610e1700a9a1755acd0a70) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/pci/host/pcie-rcar.c | 7 ++++--- |
| 1 file changed, 4 insertions(+), 3 deletions(-) |
| |
| diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c |
| index 758e2b4645f1..efdea0766b64 100644 |
| --- a/drivers/pci/host/pcie-rcar.c |
| +++ b/drivers/pci/host/pcie-rcar.c |
| @@ -319,9 +319,10 @@ static struct pci_ops rcar_pcie_ops = { |
| .write = rcar_pcie_write_conf, |
| }; |
| |
| -static void rcar_pcie_setup_window(int win, struct resource *res, |
| - struct rcar_pcie *pcie) |
| +static void rcar_pcie_setup_window(int win, struct rcar_pcie *pcie) |
| { |
| + struct resource *res = &pcie->res[win]; |
| + |
| /* Setup PCIe address space mappings for each resource */ |
| resource_size_t size; |
| u32 mask; |
| @@ -362,7 +363,7 @@ static int rcar_pcie_setup(int nr, struct pci_sys_data *sys) |
| if (!res->flags) |
| continue; |
| |
| - rcar_pcie_setup_window(i, res, pcie); |
| + rcar_pcie_setup_window(i, pcie); |
| |
| if (res->flags & IORESOURCE_IO) |
| pci_ioremap_io(nr * SZ_64K, res->start); |
| -- |
| 2.1.2 |
| |
