From: Andrew Lunn <andrew@lunn.ch>
Date: Wed, 4 Dec 2013 17:30:41 +0000 (+0100)
Subject: PCI: mvebu: Remove duplicate of_clk_get_by_name() call
X-Git-Tag: next-20131220~74^2~4^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=84f47190d6be1cb99cd4a680e1018080d93800a8;p=karo-tx-linux.git

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>
---

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)
 
 		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);