Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+6 -8
+6 -8
drivers/pci/controller/cadence/pci-j721e.c
··· 51 51 #define MAX_LANES 2 52 52 53 53 struct j721e_pcie { 54 - struct device *dev; 54 + struct cdns_pcie *cdns_pcie; 55 55 struct clk *refclk; 56 56 u32 mode; 57 57 u32 num_lanes; 58 - struct cdns_pcie *cdns_pcie; 59 58 void __iomem *user_cfg_base; 60 59 void __iomem *intd_cfg_base; 61 60 u32 linkdown_irq_regfield; ··· 98 99 static irqreturn_t j721e_pcie_link_irq_handler(int irq, void *priv) 99 100 { 100 101 struct j721e_pcie *pcie = priv; 101 - struct device *dev = pcie->dev; 102 + struct device *dev = pcie->cdns_pcie->dev; 102 103 u32 reg; 103 104 104 105 reg = j721e_pcie_intd_readl(pcie, STATUS_REG_SYS_2); ··· 164 165 static int j721e_pcie_set_mode(struct j721e_pcie *pcie, struct regmap *syscon, 165 166 unsigned int offset) 166 167 { 167 - struct device *dev = pcie->dev; 168 + struct device *dev = pcie->cdns_pcie->dev; 168 169 u32 mask = J721E_MODE_RC; 169 170 u32 mode = pcie->mode; 170 171 u32 val = 0; ··· 183 184 static int j721e_pcie_set_link_speed(struct j721e_pcie *pcie, 184 185 struct regmap *syscon, unsigned int offset) 185 186 { 186 - struct device *dev = pcie->dev; 187 + struct device *dev = pcie->cdns_pcie->dev; 187 188 struct device_node *np = dev->of_node; 188 189 int link_speed; 189 190 u32 val = 0; ··· 204 205 static int j721e_pcie_set_lane_count(struct j721e_pcie *pcie, 205 206 struct regmap *syscon, unsigned int offset) 206 207 { 207 - struct device *dev = pcie->dev; 208 + struct device *dev = pcie->cdns_pcie->dev; 208 209 u32 lanes = pcie->num_lanes; 209 210 u32 val = 0; 210 211 int ret; ··· 219 220 220 221 static int j721e_pcie_ctrl_init(struct j721e_pcie *pcie) 221 222 { 222 - struct device *dev = pcie->dev; 223 + struct device *dev = pcie->cdns_pcie->dev; 223 224 struct device_node *node = dev->of_node; 224 225 struct of_phandle_args args; 225 226 unsigned int offset = 0; ··· 376 377 if (!pcie) 377 378 return -ENOMEM; 378 379 379 - pcie->dev = dev; 380 380 pcie->mode = mode; 381 381 pcie->linkdown_irq_regfield = data->linkdown_irq_regfield; 382 382