PCI: dwc/keystone: Drop duplicated 'num-viewport'

The DWC core driver already parses and stores the 'num-viewport' DT
property, so there is no need for the Keystone driver to store it.

Link: https://lore.kernel.org/r/20200821035420.380495-21-robh@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Murali Karicheri <m-karicheri2@ti.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/dwc/pci-keystone.c
index 983069a..0fe792f 100644 (file)
--- a/drivers/pci/controller/dwc/pci-keystone.c
+++ b/drivers/pci/controller/dwc/pci-keystone.c
@@ -123,7 +123,6 @@ struct keystone_pcie {
 
        int                     msi_host_irq;
        int                     num_lanes;
-       u32                     num_viewport;
        struct phy              **phy;
        struct device_link      **link;
        struct                  device_node *msi_intc_np;
@@ -397,9 +396,9 @@ static void ks_pcie_clear_dbi_mode(struct keystone_pcie *ks_pcie)
 static void ks_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie)
 {
        u32 val;
-       u32 num_viewport = ks_pcie->num_viewport;
        struct dw_pcie *pci = ks_pcie->pci;
        struct pcie_port *pp = &pci->pp;
+       u32 num_viewport = pci->num_viewport;
        u64 start, end;
        struct resource *mem;
        int i;
@@ -1199,7 +1198,6 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
        struct resource *res;
        unsigned int version;
        void __iomem *base;
-       u32 num_viewport;
        struct phy **phy;
        int link_speed;
        u32 num_lanes;
@@ -1349,12 +1347,6 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
                        goto err_get_sync;
                }
 
-               ret = of_property_read_u32(np, "num-viewport", &num_viewport);
-               if (ret < 0) {
-                       dev_err(dev, "unable to read *num-viewport* property\n");
-                       goto err_get_sync;
-               }
-
                /*
                 * "Power Sequencing and Reset Signal Timings" table in
                 * PCI EXPRESS CARD ELECTROMECHANICAL SPECIFICATION, REV. 2.0
@@ -1368,7 +1360,6 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
                        gpiod_set_value_cansleep(gpiod, 1);
                }
 
-               ks_pcie->num_viewport = num_viewport;
                pci->pp.ops = host_ops;
                ret = ks_pcie_add_pcie_port(ks_pcie, pdev);
                if (ret < 0)