From mboxrd@z Thu Jan 1 00:00:00 1970 From: sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth) Date: Tue, 13 Aug 2013 11:22:56 +0200 Subject: [PATCH 1/9] PCI: mvebu: move clock enable before register access In-Reply-To: <20130813091106.326c562a@skate> References: <1376333215-12885-1-git-send-email-sebastian.hesselbarth@gmail.com> <1376333215-12885-2-git-send-email-sebastian.hesselbarth@gmail.com> <20130813091106.326c562a@skate> Message-ID: <5209FAF0.5040807@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On 08/13/13 09:11, Thomas Petazzoni wrote: > On Mon, 12 Aug 2013 20:46:47 +0200, Sebastian Hesselbarth wrote: >> + 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); > > You shouldn't iounmap() here in case of error, since the register > mapping hasn't been done yet. Dooh, it was in my testing branch, but I failed to transfer that when separating the changes to single patches. Will update. >> + port->haslink = 0; >> + continue; >> + } >> + clk_prepare_enable(port->clk); > > Nitpick, an empty new line between the closing } and the > clk_prepare_enable() line would be nice. Ok, as Theirry mentioned to check for clk_prepare_enable's return value that would give a new "if (..)" anyway. Although, it might be the first driver ever checking for this return value ;) >> + >> port->base = mvebu_pcie_map_registers(pdev, child, port); >> if (!port->base) { >> dev_err(&pdev->dev, "PCIe%d.%d: cannot map registers\n", >> @@ -916,22 +926,9 @@ static int __init mvebu_pcie_probe(struct platform_device *pdev) >> port->port, port->lane); > > and maybe here you could unprepare+release the clock if we haven't > managed to remap registers? Ack. Sebastian