From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-186.mta1.migadu.com (out-186.mta1.migadu.com [95.215.58.186]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D29DA82D91 for ; Thu, 23 May 2024 20:18:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.186 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716495533; cv=none; b=pg3PI51a4rTPRdcw9iQjuYiRuSU9yJNRMXr9t6NYLTklD/yjONWcOw/pSNghI4Bd1NxHFCkg1Vgn4663gveUYnfEzvoUIOqtg2J/ic9FDAOlcBARwT5tTQKk5FT0OVa894Rb8Sn7aWucllXnpou6R1XZQ9ax2DenBICw15UIHT4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716495533; c=relaxed/simple; bh=/MnKLO3shXWEZFBIMAsNwFyC317yrwWObfqwNCUloow=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=uLK5n+HdEdc56vKgO08fAYaADW1mkkiLSrVxFxYPCynDTMYBboh7R5K5GkFGO8m2cjiw+6ieoaIRpazUHlnIvhOxYFU46Swtm/mz8ARceODfHtbrRGjoP8ZTjWNe8BF1rTAfQrXqoRTlOLbn4xTfZZwgd2DJdH9C9gO3ShAJM2w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=gaTRJS5V; arc=none smtp.client-ip=95.215.58.186 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="gaTRJS5V" X-Envelope-To: markus.elfring@web.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1716495529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b6Wt/yr5KVLoM5TaMmIZdJgpIFHqeGyswfXtkHFJYik=; b=gaTRJS5V2i8CsvTKTxwRH7Eml035EyZJldaxir3Sy+sotgCbBJPtXmN/qy9ArbajrCZDTT JOBGcTzNEuizdoJjis4+R4rfFC2+2MVjzOGuQokAaLayUNBE4c+kNtnozpyW7q24rOveS4 lOld6QJrNva6uNYLTJQSyuQdjTJv25g= X-Envelope-To: linux-arm-kernel@lists.infradead.org X-Envelope-To: linux-pci@vger.kernel.org X-Envelope-To: kw@linux.com X-Envelope-To: lpieralisi@kernel.org X-Envelope-To: robh@kernel.org X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: bharat.kumar.gogada@xilinx.com X-Envelope-To: bhelgaas@google.com X-Envelope-To: lorenzo.pieralisi@arm.com X-Envelope-To: michal.simek@amd.com X-Envelope-To: michal.simek@xilinx.com X-Envelope-To: thippeswamy.havalige@amd.com Message-ID: Date: Thu, 23 May 2024 16:18:42 -0400 Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Subject: Re: [PATCH v3 5/7] PCI: xilinx-nwl: Clean up clock on probe failure/removal To: Markus Elfring , linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, =?UTF-8?Q?Krzysztof_Wilczy=C5=84ski?= , Lorenzo Pieralisi , Rob Herring Cc: LKML , Bharat Kumar Gogada , Bjorn Helgaas , Lorenzo Pieralisi , Michal Simek , Michal Simek , Thippeswamy Havalige References: <20240520145402.2526481-6-sean.anderson@linux.dev> <4a43cda4-dfa4-4156-b616-75e740f6fd64@web.de> Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Sean Anderson In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT On 5/23/24 16:11, Markus Elfring wrote: >>> … >>>> +++ 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: >> ... > > This design variant can also be reasonable. > > Do any preferences matter here for label name selections? Personally, I prefer to use labels named after what they're cleaning up and not what they're doing. --Sean From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 46242C25B75 for ; Thu, 23 May 2024 20:19:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To: Subject:MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=agYK2SwpSS5RFHZhhkqHkghIMf/JBmlnUZmyrmfELAI=; b=K22NzOuLPlmlmj nEZRMkJRrO629NEhYolPZZ+N1jY9C3cfechJR33xMY7Mjqt8ln8opPfIATL55B7kjIHP3HulGDTsy 3qtBSfTBT8/9Vxy66h5Bj/D0Hp4CEZsC0dywCHImxUnBSUMhtsTs65CT9L9KWLlnFIzvwGDiwfDAU RkLwUx4wczT+NJ5qNeSSQz5xFjpG3JYkESnfmluwPG0gLREg0NEhk3qjQIVSlnW4frGxTQNbqkZvN xKw7Csng0VvCwjWDXktSUghVGFXMV8XRuHNLlDwI3l76NbI8Ms4OHxEWQQM4oHT/o/fPNM1gVVeVW jePqsPkbB1+DPuTI8D8Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sAEts-00000007ERE-2qFD; Thu, 23 May 2024 20:18:57 +0000 Received: from out-182.mta1.migadu.com ([95.215.58.182]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sAEto-00000007EQj-22iv for linux-arm-kernel@lists.infradead.org; Thu, 23 May 2024 20:18:54 +0000 X-Envelope-To: markus.elfring@web.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1716495529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=b6Wt/yr5KVLoM5TaMmIZdJgpIFHqeGyswfXtkHFJYik=; b=gaTRJS5V2i8CsvTKTxwRH7Eml035EyZJldaxir3Sy+sotgCbBJPtXmN/qy9ArbajrCZDTT JOBGcTzNEuizdoJjis4+R4rfFC2+2MVjzOGuQokAaLayUNBE4c+kNtnozpyW7q24rOveS4 lOld6QJrNva6uNYLTJQSyuQdjTJv25g= X-Envelope-To: linux-arm-kernel@lists.infradead.org X-Envelope-To: linux-pci@vger.kernel.org X-Envelope-To: kw@linux.com X-Envelope-To: lpieralisi@kernel.org X-Envelope-To: robh@kernel.org X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: bharat.kumar.gogada@xilinx.com X-Envelope-To: bhelgaas@google.com X-Envelope-To: lorenzo.pieralisi@arm.com X-Envelope-To: michal.simek@amd.com X-Envelope-To: michal.simek@xilinx.com X-Envelope-To: thippeswamy.havalige@amd.com Message-ID: Date: Thu, 23 May 2024 16:18:42 -0400 MIME-Version: 1.0 Subject: Re: [PATCH v3 5/7] PCI: xilinx-nwl: Clean up clock on probe failure/removal To: Markus Elfring , linux-arm-kernel@lists.infradead.org, linux-pci@vger.kernel.org, =?UTF-8?Q?Krzysztof_Wilczy=C5=84ski?= , Lorenzo Pieralisi , Rob Herring Cc: LKML , Bharat Kumar Gogada , Bjorn Helgaas , Lorenzo Pieralisi , Michal Simek , Michal Simek , Thippeswamy Havalige References: <20240520145402.2526481-6-sean.anderson@linux.dev> <4a43cda4-dfa4-4156-b616-75e740f6fd64@web.de> Content-Language: en-US X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Sean Anderson In-Reply-To: X-Migadu-Flow: FLOW_OUT X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240523_131852_815156_2622327B X-CRM114-Status: GOOD ( 10.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org T24gNS8yMy8yNCAxNjoxMSwgTWFya3VzIEVsZnJpbmcgd3JvdGU6Cj4+PiDigKYKPj4+PiArKysg Yi9kcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaWUteGlsaW54LW53bC5jCj4+PiDigKYKPj4+PiBA QCAtODE3LDExICs4MTgsMjMgQEAgc3RhdGljIGludCBud2xfcGNpZV9wcm9iZShzdHJ1Y3QgcGxh dGZvcm1fZGV2aWNlICpwZGV2KQo+Pj4+ICAJCWVyciA9IG53bF9wY2llX2VuYWJsZV9tc2kocGNp ZSk7Cj4+Pj4gIAkJaWYgKGVyciA8IDApIHsKPj4+PiAgCQkJZGV2X2VycihkZXYsICJmYWlsZWQg dG8gZW5hYmxlIE1TSSBzdXBwb3J0OiAlZFxuIiwgZXJyKTsKPj4+PiAtCQkJcmV0dXJuIGVycjsK Pj4+PiArCQkJZ290byBlcnJfY2xrOwo+Pj4+ICAJCX0KPj4+PiAgCX0KPj4+Pgo+Pj4+IC0JcmV0 dXJuIHBjaV9ob3N0X3Byb2JlKGJyaWRnZSk7Cj4+Pj4gKwllcnIgPSBwY2lfaG9zdF9wcm9iZShi cmlkZ2UpOwo+Pj4+ICsKPj4+PiArZXJyX2NsazoKPj4+PiArCWlmIChlcnIpCj4+Pj4gKwkJY2xr X2Rpc2FibGVfdW5wcmVwYXJlKHBjaWUtPmNsayk7Cj4+Pgo+Pj4gSSBzdWdnZXN0IHRvIHVzZSB0 aGUgbGFiZWwg4oCcZGlzYWJsZV91bnByZXBhcmVfY2xvY2vigJ0gZGlyZWN0bHkgYmVmb3JlIHRo aXMgZnVuY3Rpb24gY2FsbAo+Pj4gKGluIHRoZSBpZiBicmFuY2gpIHNvIHRoYXQgYSBkdXBsaWNh dGUgY2hlY2sgd291bGQgYmUgYXZvaWRlZCBhZnRlciBzb21lIGVycm9yIGNhc2VzLgo+Pgo+PiBX ZWxsIGlmIHlvdSB3YW50IHRvIGF2b2lkIGEgY2hlY2ssIHdlIGNhbiBqdXN0IGRvCj4+Cj4+IGVy ciA9IHBjaV9ob3N0X3Byb2JlKGJyaWRnZSk7Cj4+IGlmICghZXJyKQo+PiAJcmV0dXJuIDA7Cj4+ Cj4+IGVycl9jbGs6Cj4+IAkuLi4KPiAKPiBUaGlzIGRlc2lnbiB2YXJpYW50IGNhbiBhbHNvIGJl IHJlYXNvbmFibGUuCj4gCj4gRG8gYW55IHByZWZlcmVuY2VzIG1hdHRlciBoZXJlIGZvciBsYWJl bCBuYW1lIHNlbGVjdGlvbnM/CgpQZXJzb25hbGx5LCBJIHByZWZlciB0byB1c2UgbGFiZWxzIG5h bWVkIGFmdGVyIHdoYXQgdGhleSdyZSBjbGVhbmluZyB1cCBhbmQgbm90IHdoYXQgdGhleSdyZSBk b2luZy4KCi0tU2VhbgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KbGludXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0 cy5pbmZyYWRlYWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGlu Zm8vbGludXgtYXJtLWtlcm5lbAo=