Skip to content

Commit 19e8638

Browse files
committed
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/[email protected] Signed-off-by: Bjorn Helgaas <[email protected]> Cc: Kishon Vijay Abraham I <[email protected]> Cc: Tom Joseph <[email protected]>
1 parent 72de208 commit 19e8638

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

drivers/pci/controller/cadence/pci-j721e.c

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,10 @@ enum link_status {
5151
#define MAX_LANES 2
5252

5353
struct j721e_pcie {
54-
struct device *dev;
54+
struct cdns_pcie *cdns_pcie;
5555
struct clk *refclk;
5656
u32 mode;
5757
u32 num_lanes;
58-
struct cdns_pcie *cdns_pcie;
5958
void __iomem *user_cfg_base;
6059
void __iomem *intd_cfg_base;
6160
u32 linkdown_irq_regfield;
@@ -99,7 +98,7 @@ static inline void j721e_pcie_intd_writel(struct j721e_pcie *pcie, u32 offset,
9998
static irqreturn_t j721e_pcie_link_irq_handler(int irq, void *priv)
10099
{
101100
struct j721e_pcie *pcie = priv;
102-
struct device *dev = pcie->dev;
101+
struct device *dev = pcie->cdns_pcie->dev;
103102
u32 reg;
104103

105104
reg = j721e_pcie_intd_readl(pcie, STATUS_REG_SYS_2);
@@ -165,7 +164,7 @@ static const struct cdns_pcie_ops j721e_pcie_ops = {
165164
static int j721e_pcie_set_mode(struct j721e_pcie *pcie, struct regmap *syscon,
166165
unsigned int offset)
167166
{
168-
struct device *dev = pcie->dev;
167+
struct device *dev = pcie->cdns_pcie->dev;
169168
u32 mask = J721E_MODE_RC;
170169
u32 mode = pcie->mode;
171170
u32 val = 0;
@@ -184,7 +183,7 @@ static int j721e_pcie_set_mode(struct j721e_pcie *pcie, struct regmap *syscon,
184183
static int j721e_pcie_set_link_speed(struct j721e_pcie *pcie,
185184
struct regmap *syscon, unsigned int offset)
186185
{
187-
struct device *dev = pcie->dev;
186+
struct device *dev = pcie->cdns_pcie->dev;
188187
struct device_node *np = dev->of_node;
189188
int link_speed;
190189
u32 val = 0;
@@ -205,7 +204,7 @@ static int j721e_pcie_set_link_speed(struct j721e_pcie *pcie,
205204
static int j721e_pcie_set_lane_count(struct j721e_pcie *pcie,
206205
struct regmap *syscon, unsigned int offset)
207206
{
208-
struct device *dev = pcie->dev;
207+
struct device *dev = pcie->cdns_pcie->dev;
209208
u32 lanes = pcie->num_lanes;
210209
u32 val = 0;
211210
int ret;
@@ -220,7 +219,7 @@ static int j721e_pcie_set_lane_count(struct j721e_pcie *pcie,
220219

221220
static int j721e_pcie_ctrl_init(struct j721e_pcie *pcie)
222221
{
223-
struct device *dev = pcie->dev;
222+
struct device *dev = pcie->cdns_pcie->dev;
224223
struct device_node *node = dev->of_node;
225224
struct of_phandle_args args;
226225
unsigned int offset = 0;
@@ -377,7 +376,6 @@ static int j721e_pcie_probe(struct platform_device *pdev)
377376
if (!pcie)
378377
return -ENOMEM;
379378

380-
pcie->dev = dev;
381379
pcie->mode = mode;
382380
pcie->linkdown_irq_regfield = data->linkdown_irq_regfield;
383381

0 commit comments

Comments
 (0)