PCI: j721e: Drop redundant struct device *

The struct cdns_pcie already contains the struct device for the j721e PCIe
controller.  There's no need to store another copy in struct j721e_pcie.
Remove the redundant copy from struct j721e_pcie.

Link: https://lore.kernel.org/r/20211223011054.1227810-10-helgaas@kernel.org
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Tom Joseph <tjoseph@cadence.com>

diff --git a/drivers/pci/controller/cadence/pci-j721e.c b/drivers/pci/controller/cadence/pci-j721e.c
index cd43d18984826c47896e1bd66577fc2dec84c5c3..489586a4cdc7b8443eda32f63f84819ebaa89e74 100644 (file)
--- a/drivers/pci/controller/cadence/pci-j721e.c
+++ b/drivers/pci/controller/cadence/pci-j721e.c
@@ -51,11 +51,10 @@ enum link_status {
 #define MAX_LANES                      2
 
 struct j721e_pcie {
-       struct device           *dev;
+       struct cdns_pcie        *cdns_pcie;
        struct clk              *refclk;
        u32                     mode;
        u32                     num_lanes;
-       struct cdns_pcie        *cdns_pcie;
        void __iomem            *user_cfg_base;
        void __iomem            *intd_cfg_base;
        u32                     linkdown_irq_regfield;
@@ -99,7 +98,7 @@ static inline void j721e_pcie_intd_writel(struct j721e_pcie *pcie, u32 offset,
 static irqreturn_t j721e_pcie_link_irq_handler(int irq, void *priv)
 {
        struct j721e_pcie *pcie = priv;
-       struct device *dev = pcie->dev;
+       struct device *dev = pcie->cdns_pcie->dev;
        u32 reg;
 
        reg = j721e_pcie_intd_readl(pcie, STATUS_REG_SYS_2);
@@ -165,7 +164,7 @@ static const struct cdns_pcie_ops j721e_pcie_ops = {
 static int j721e_pcie_set_mode(struct j721e_pcie *pcie, struct regmap *syscon,
                               unsigned int offset)
 {
-       struct device *dev = pcie->dev;
+       struct device *dev = pcie->cdns_pcie->dev;
        u32 mask = J721E_MODE_RC;
        u32 mode = pcie->mode;
        u32 val = 0;
@@ -184,7 +183,7 @@ static int j721e_pcie_set_mode(struct j721e_pcie *pcie, struct regmap *syscon,
 static int j721e_pcie_set_link_speed(struct j721e_pcie *pcie,
                                     struct regmap *syscon, unsigned int offset)
 {
-       struct device *dev = pcie->dev;
+       struct device *dev = pcie->cdns_pcie->dev;
        struct device_node *np = dev->of_node;
        int link_speed;
        u32 val = 0;
@@ -205,7 +204,7 @@ static int j721e_pcie_set_link_speed(struct j721e_pcie *pcie,
 static int j721e_pcie_set_lane_count(struct j721e_pcie *pcie,
                                     struct regmap *syscon, unsigned int offset)
 {
-       struct device *dev = pcie->dev;
+       struct device *dev = pcie->cdns_pcie->dev;
        u32 lanes = pcie->num_lanes;
        u32 val = 0;
        int ret;
@@ -220,7 +219,7 @@ static int j721e_pcie_set_lane_count(struct j721e_pcie *pcie,
 
 static int j721e_pcie_ctrl_init(struct j721e_pcie *pcie)
 {
-       struct device *dev = pcie->dev;
+       struct device *dev = pcie->cdns_pcie->dev;
        struct device_node *node = dev->of_node;
        struct of_phandle_args args;
        unsigned int offset = 0;
@@ -377,7 +376,6 @@ static int j721e_pcie_probe(struct platform_device *pdev)
        if (!pcie)
                return -ENOMEM;
 
-       pcie->dev = dev;
        pcie->mode = mode;
        pcie->linkdown_irq_regfield = data->linkdown_irq_regfield;