On 03/19/2018 09:44 AM, Simon Horman wrote:
> On Sun, Mar 18, 2018 at 11:52:09AM +0100, Marek Vasut wrote:
>> From: Dien Pham <dien.pham...@rvc.renesas.com>
>>
>> The controller clock can be switched off during suspend/resume,
>> let runtime PM take care of that.
>>
>> Signed-off-by: Dien Pham <dien.pham...@rvc.renesas.com>
>> Signed-off-by: Hien Dang <hien.dang...@renesas.com>
>> Signed-off-by: Marek Vasut <marek.vasut+rene...@gmail.com>
>> Cc: Geert Uytterhoeven <geert+rene...@glider.be>
>> Cc: Lorenzo Pieralisi <lorenzo.pieral...@arm.com>
>> Cc: Phil Edworthy <phil.edwor...@renesas.com>
>> Cc: Simon Horman <horms+rene...@verge.net.au>
>> Cc: Wolfram Sang <w...@the-dreams.de>
>> Cc: linux-renesas-soc@vger.kernel.org
>> To: linux-...@vger.kernel.org
>> ---
>> V2: - Reorder the fail path in rcar_pcie_probe() to cater for the
>> reordering of function calls in probe
>> - Dispose of fail_clk in rcar_pcie_get_resources()
>> V3: - Fix up the failpath in probe function
>> V4: - Rebase on recent linux-next
>> ---
>> drivers/pci/host/pcie-rcar.c | 40 ++++++++++++----------------------------
>> 1 file changed, 12 insertions(+), 28 deletions(-)
>>
>> diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
>> index b4c4aad2cf66..93d59f15c589 100644
>> --- a/drivers/pci/host/pcie-rcar.c
>> +++ b/drivers/pci/host/pcie-rcar.c
>> @@ -142,7 +142,6 @@ struct rcar_pcie {
>> void __iomem *base;
>> struct list_head resources;
>> int root_bus_nr;
>> - struct clk *clk;
>> struct clk *bus_clk;
>> struct rcar_msi msi;
>> };
>> @@ -914,24 +913,14 @@ static int rcar_pcie_get_resources(struct rcar_pcie
>> *pcie)
>> if (IS_ERR(pcie->base))
>> return PTR_ERR(pcie->base);
>>
>> - pcie->clk = devm_clk_get(dev, "pcie");
>> - if (IS_ERR(pcie->clk)) {
>> - dev_err(dev, "cannot get platform clock\n");
>> - return PTR_ERR(pcie->clk);
>> - }
>> - err = clk_prepare_enable(pcie->clk);
>> - if (err)
>> - return err;
>> -
>> pcie->bus_clk = devm_clk_get(dev, "pcie_bus");
>> if (IS_ERR(pcie->bus_clk)) {
>> dev_err(dev, "cannot get pcie bus clock\n");
>> - err = PTR_ERR(pcie->bus_clk);
>> - goto fail_clk;
>> + return PTR_ERR(pcie->bus_clk);
>> }
>> err = clk_prepare_enable(pcie->bus_clk);
>> if (err)
>> - goto fail_clk;
>> + return err;
>>
>> i = irq_of_parse_and_map(dev->of_node, 0);
>> if (!i) {
>> @@ -953,8 +942,6 @@ static int rcar_pcie_get_resources(struct rcar_pcie
>> *pcie)
>>
>> err_map_reg:
>> clk_disable_unprepare(pcie->bus_clk);
>> -fail_clk:
>> - clk_disable_unprepare(pcie->clk);
>>
>> return err;
>> }
>> @@ -1124,22 +1111,22 @@ static int rcar_pcie_probe(struct platform_device
>> *pdev)
>> if (err)
>> goto err_free_bridge;
>
> This error path now calls pci_free_resource_list() and in this case
> the path is taken if rcar_pcie_parse_request_of_pci_ranges() fails.
> Is that ok?
I think so, or did I miss something obvious?
--
Best regards,
Marek Vasut
