Commit 84f47190 authored Dec 04, 2013 by Andrew Lunn Committed by Bjorn Helgaas Dec 09, 2013

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>

parent 641e674d

drivers/pci/host/pci-mvebu.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -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);