Received-SPF: pass (google.com: domain of linux-kernel+bounces-187959-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Message-ID: <f541195e-7963-4970-9a1d-a3298226cdd5@web.de>
Date: Thu, 23 May 2024 22:11:20 +0200
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH v3 5/7] PCI: xilinx-nwl: Clean up clock on probe
 failure/removal
To: Sean Anderson <sean.anderson@linux.dev>,
 linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org,
 =?UTF-8?Q?Krzysztof_Wilczy=C5=84ski?= <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>
References: <20240520145402.2526481-6-sean.anderson@linux.dev>
 <4a43cda4-dfa4-4156-b616-75e740f6fd64@web.de>
 <bb9e239f-902b-4f52-a5e9-98c29b360418@linux.dev>
Content-Language: en-GB
From: Markus Elfring <Markus.Elfring@web.de>
In-Reply-To: <bb9e239f-902b-4f52-a5e9-98c29b360418@linux.dev>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
UI-OutboundReport: notjunk:1;M01:P0:ylFft9ZDubI=;jo1fRE94B8Xtowztpq0sPRbsVf8
 1cr8nbdQN6GH688tqhMolPOOrpbgXQ59MikyI8c8RC5vdyJKqXsJ7EoLxLg+9DtQOxcmA8MvV
 wXtxqQ3m7Bzf8U1VXtn76lzcqOVUyUXMiHYHh3pn3KjksRDD8FgR9/apQgyZNifYO7FfHJ0My
 exLJzCmoFnWgCRpajwcFOOo0BXbXEGKEVZtLEo0d5rORAFirrXB1yHdohIFD+d9oSMCWYD5pO
 9YlBRRG6Y4HvgN9lkNA8yH4UUirUks/OEXaf2SPos8GCHRClQdiotaTUsK5j1FC4woB0Nkrnx
 PeIAVkuaJFqBdg69iRoAnk0aaDOkju03tjUQEw7s0LDPEMnwD1SjXgsK4D5qOdEOIUtFUBRoS
 sqVkKSHmeP6gWoN52EaYWPlsTFD0tTZkxaNBh7k5ltiIYKrXJiZENcPFzAGhaDs5qlxjINA90
 WMNhhJCJxSoCtTasXjN7Ia00uVC1FJXwSzQdfKqYnU/Lh5Xe8L2PyS2oEcN24+By7bkz5z87B
 EU/TRHkzH9joFtEk3YENeO6UobvGZOpEWsoJgTXCvfsAs4bP0KgAkFnNrckdPDq3KB18HLsCQ
 Pf5RhlqzaAjjkRp2OHtaNvg9qsDAMA90BTmnyo1t6y2xxEOYP+5qLhtR8w8FdI/FyajmLiNtb
 Q2oqlY1FeuycdXtU0J9OCtheAVL7aKijHsytMFt2fJZJAQK6wNnUVhKAFSCXmGdHqaV6NYGPr
 xaXARvKzsAQSTtwxmwllV8yHT4H2lmRHjs7+RTQRIdEG9Ojn9WvYsBY5J29ojiKJ6HpT3hj01
 UvWotxE2nBivOnnbCVgM4D8I5v60M2mP7XPhLqiMHZoe8=

>> =E2=80=A6
>>> +++ b/drivers/pci/controller/pcie-xilinx-nwl.c
>> =E2=80=A6
>>> @@ -817,11 +818,23 @@ static int nwl_pcie_probe(struct platform_device=
 *pdev)
>>>  		err =3D 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 =3D pci_host_probe(bridge);
>>> +
>>> +err_clk:
>>> +	if (err)
>>> +		clk_disable_unprepare(pcie->clk);
>>
>> I suggest to use the label =E2=80=9Cdisable_unprepare_clock=E2=80=9D di=
rectly before this function call
>> (in the if branch) so that a duplicate check would be avoided after som=
e error cases.
>
> Well if you want to avoid a check, we can just do
>
> err =3D pci_host_probe(bridge);
> if (!err)
> 	return 0;
>
> err_clk:
> 	...

This design variant can also be reasonable.

Do any preferences matter here for label name selections?

Regards,
Markus