Commit 84f47190 authored by Andrew Lunn's avatar Andrew Lunn Committed by Bjorn Helgaas

PCI: mvebu: Remove duplicate of_clk_get_by_name() call

Probably due to a merge conflict resolution gone bad, the PCI clock is
got twice.  Remove the redundant call of of_clk_get_by_name().
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarJingoo Han <jg1.han@samsung.com>
Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 641e674d
...@@ -981,14 +981,6 @@ static int mvebu_pcie_probe(struct platform_device *pdev) ...@@ -981,14 +981,6 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
mvebu_pcie_set_local_dev_nr(port, 1); mvebu_pcie_set_local_dev_nr(port, 1);
port->clk = of_clk_get_by_name(child, NULL);
if (IS_ERR(port->clk)) {
dev_err(&pdev->dev, "PCIe%d.%d: cannot get clock\n",
port->port, port->lane);
iounmap(port->base);
continue;
}
port->dn = child; port->dn = child;
spin_lock_init(&port->conf_lock); spin_lock_init(&port->conf_lock);
mvebu_sw_pci_bridge_init(port); mvebu_sw_pci_bridge_init(port);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment