On Wed, Dec 04, 2013 at 06:30:41PM +0100, Andrew Lunn wrote:
> Probably due to a merge conflict resolution gone bad, the pci clock is
> got twice. Remove the second redundent of_clk_get_by_name().
>
> Signed-off-by: Andrew Lunn <andrew@xxxxxxx>
Applied to my pci/host-mvebu branch for v3.14, thanks!
Bjorn
> ---
> drivers/pci/host/pci-mvebu.c | 8 --------
> 1 file changed, 8 deletions(-)
>
> diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
> index c269e430c760..96352be58cc9 100644
> --- a/drivers/pci/host/pci-mvebu.c
> +++ b/drivers/pci/host/pci-mvebu.c
> @@ -949,14 +949,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);
> --
> 1.8.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
