aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2013-12-04 12:30:41 -0500
committerBjorn Helgaas <bhelgaas@google.com>2013-12-09 18:27:02 -0500
commit84f47190d6be1cb99cd4a680e1018080d93800a8 (patch)
treeb98b51307fec8562bd313a97bf6dd2a44a9719ac
parent641e674d6c0f974162c4c8cc0081c7ffc50b3911 (diff)
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: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Jingoo Han <jg1.han@samsung.com> Acked-by: Jason Cooper <jason@lakedaemon.net>
-rw-r--r--drivers/pci/host/pci-mvebu.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index abd560e46757..6f35df5fedce 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -981,14 +981,6 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
981 981
982 mvebu_pcie_set_local_dev_nr(port, 1); 982 mvebu_pcie_set_local_dev_nr(port, 1);
983 983
984 port->clk = of_clk_get_by_name(child, NULL);
985 if (IS_ERR(port->clk)) {
986 dev_err(&pdev->dev, "PCIe%d.%d: cannot get clock\n",
987 port->port, port->lane);
988 iounmap(port->base);
989 continue;
990 }
991
992 port->dn = child; 984 port->dn = child;
993 spin_lock_init(&port->conf_lock); 985 spin_lock_init(&port->conf_lock);
994 mvebu_sw_pci_bridge_init(port); 986 mvebu_sw_pci_bridge_init(port);