PCI: mvebu: Remove duplicate of_clk_get_by_name() call
authorAndrew Lunn <andrew@lunn.ch>
Wed, 4 Dec 2013 17:30:41 +0000 (18:30 +0100)
committerBjorn Helgaas <bhelgaas@google.com>
Mon, 9 Dec 2013 23:27:02 +0000 (16:27 -0700)
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>
drivers/pci/host/pci-mvebu.c

index abd560e46757a7bba7fd77c5ff5d88e86366369f..6f35df5fedce72f6d5d875a67a325e4e7aafb9fa 100644 (file)
@@ -981,14 +981,6 @@ static int mvebu_pcie_probe(struct platform_device *pdev)
 
                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;
                spin_lock_init(&port->conf_lock);
                mvebu_sw_pci_bridge_init(port);