Re: [PATCH v3 5/7] PCI: xilinx-nwl: Clean up clock on probe failure/removal

From: Sean Anderson <sean.anderson@linux.dev>
To: "Markus Elfring" <Markus.Elfring@web.de>,
	linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org,
	"Krzysztof Wilczyński" <kw@linux.com>,
	"Lorenzo Pieralisi" <lpieralisi@kernel.org>,
	"Rob Herring" <robh@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
	Bharat Kumar Gogada <bharat.kumar.gogada@xilinx.com>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
	Michal Simek <michal.simek@amd.com>,
	Michal Simek <michal.simek@xilinx.com>,
	Thippeswamy Havalige <thippeswamy.havalige@amd.com>
Subject: Re: [PATCH v3 5/7] PCI: xilinx-nwl: Clean up clock on probe failure/removal
Date: Thu, 23 May 2024 15:21:48 -0400	[thread overview]
Message-ID: <bb9e239f-902b-4f52-a5e9-98c29b360418@linux.dev> (raw)
In-Reply-To: <4a43cda4-dfa4-4156-b616-75e740f6fd64@web.de>

On 5/23/24 15:18, Markus Elfring wrote:
>> Make sure we turn off the clock on probe failure and device removal.
> …
>> +++ b/drivers/pci/controller/pcie-xilinx-nwl.c
> …
>> @@ -817,11 +818,23 @@ static int nwl_pcie_probe(struct platform_device *pdev)
>>  		err = nwl_pcie_enable_msi(pcie);
>>  		if (err < 0) {
>>  			dev_err(dev, "failed to enable MSI support: %d\n", err);
>> -			return err;
>> +			goto err_clk;
>>  		}
>>  	}
>>
>> -	return pci_host_probe(bridge);
>> +	err = pci_host_probe(bridge);
>> +
>> +err_clk:
>> +	if (err)
>> +		clk_disable_unprepare(pcie->clk);
> 
> I suggest to use the label “disable_unprepare_clock” directly before this function call
> (in the if branch) so that a duplicate check would be avoided after some error cases.

Well if you want to avoid a check, we can just do

err = pci_host_probe(bridge);
if (!err)
	return 0;

err_clk:
	...

--Sean