@@ -612,7 +612,6 @@ static int __init imx6_pcie_probe(struct platform_device *pdev)
struct pcie_port *pp;
struct device_node *np = pdev->dev.of_node;
struct resource *dbi_base;
- struct device_node *node = pdev->dev.of_node;
int ret;
imx6 = devm_kzalloc(&pdev->dev, sizeof(*imx6), GFP_KERNEL);
@@ -691,29 +690,26 @@ static int __init imx6_pcie_probe(struct platform_device *pdev)
}
/* Grab PCIe PHY Tx Settings */
- if (of_property_read_u32(node, "fsl,tx-deemph-gen1",
+ if (of_property_read_u32(np, "fsl,tx-deemph-gen1",
&imx6->tx_deemph_gen1))
imx6->tx_deemph_gen1 = 0;
- if (of_property_read_u32(node, "fsl,tx-deemph-gen2-3p5db",
+ if (of_property_read_u32(np, "fsl,tx-deemph-gen2-3p5db",
&imx6->tx_deemph_gen2_3p5db))
imx6->tx_deemph_gen2_3p5db = 0;
- if (of_property_read_u32(node, "fsl,tx-deemph-gen2-6db",
+ if (of_property_read_u32(np, "fsl,tx-deemph-gen2-6db",
&imx6->tx_deemph_gen2_6db))
imx6->tx_deemph_gen2_6db = 20;
- if (of_property_read_u32(node, "fsl,tx-swing-full",
- &imx6->tx_swing_full))
+ if (of_property_read_u32(np, "fsl,tx-swing-full", &imx6->tx_swing_full))
imx6->tx_swing_full = 127;
- if (of_property_read_u32(node, "fsl,tx-swing-low",
- &imx6->tx_swing_low))
+ if (of_property_read_u32(np, "fsl,tx-swing-low", &imx6->tx_swing_low))
imx6->tx_swing_low = 127;
/* Limit link speed */
- ret = of_property_read_u32(pp->dev->of_node, "fsl,max-link-speed",
- &imx6->link_gen);
+ ret = of_property_read_u32(np, "fsl,max-link-speed", &imx6->link_gen);
if (ret)
imx6->link_gen = 1;
"node" is a redundant copy of the "np" of_node pointer. Remove "node" and use "np" instead. Replace the "fsl,max-link-speed" use with "np" as well. No functional change intended. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> --- drivers/pci/host/pci-imx6.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html