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 F08B2C3DA49 for ; Thu, 25 Jul 2024 04:31:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To: Content-Transfer-Encoding:Content-Type:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=XXfannR0i35m+kTBwRZd8UAXF5c0K76k4L1K8mKl1Ek=; b=hCKeH0AcJPvTm45GR2QMPxlUm5 XYQmfu739Z5QlPKiuU/Poln66eQwlvP2mp/GhJODUKHKNuOVYgb87+Kmonuxb8EyWao1hT7ECVpzn l4gDOgOBQlAuPHtKDNt1vjjrku1kM7Jo/WLtczuZEN2j2UsVCw7RN7HByWOIgQwjzPaaQXXItOERC RNnImwZuh5EyPeYs1cpLA5Bbq/fzrasFalEoypVd18NdSbb6xeVf99sLEdofNVqScsvU/zr6dv5ol 05WgIkYV2gqzwSzGX5mGukWOcxuZSxQo3kiKPYrvOZ+Q9EeZi1KV+LWySd89gJQS7R/FFENfScswc UiSfVnTA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWq8k-0000000HLqF-2Jg8; Thu, 25 Jul 2024 04:31:42 +0000 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sWq8M-0000000HLiK-11L8 for linux-arm-kernel@lists.infradead.org; Thu, 25 Jul 2024 04:31:20 +0000 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-70d199fb3dfso423683b3a.3 for ; Wed, 24 Jul 2024 21:31:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1721881877; x=1722486677; darn=lists.infradead.org; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date:from:to :cc:subject:date:message-id:reply-to; bh=XXfannR0i35m+kTBwRZd8UAXF5c0K76k4L1K8mKl1Ek=; b=M24tJalSR6Nut5pqosWodtsIEl3NfLSE2xTSRhLX6CAT1mFNYsiM6em9/nN0Au13o0 zDXaSHLLpB5pO8qX0DJbwH1hIEzLJUVCDW7IQ6sXls+MFcTGDaZG23HExr13mNUmy/dW eVuyxC50ttIjozgjELejUYEApspUhwr60yQV6xed1/rR5vIfjOYNFnNUfATuV8JIPlcx p+lFAOSfanWX0E7io2OWFQ2ORIv+yqpbJXHXd5hLVknVwAUzT+6YG+adrWtPjP4YK65e um+9PUakUddDui87ATgu7cAECl4kiGoho37pTCQDtonCFL1UnUNTrqG3jHYxieVSo8Tf hk3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721881877; x=1722486677; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XXfannR0i35m+kTBwRZd8UAXF5c0K76k4L1K8mKl1Ek=; b=vlYRwXiWUJDQ05W6sz7vbnxX5RN68X6hOiQABAoSlqjH3TF82boz6tVWc9jRgqP1N/ /RFZ+BFrZtBuQoaKqzXPYahU/1Jlyawiq9YMg+b75BpVbgA0VfSNcpqfWat/metgvzlR jlaO6P6/CjZkIf2LyPSbyKWZE9oua1NXJOnZwTGlzsuVBPmUnOPWMDxe7ao8a+TlIkOg g4HfhGrFpvmvPswXI5kb3cdB9IsjOsVp/irjnZl8PkpcCTT0urcJiyAPiOenX1fdrYH0 IWakLRChI2XpcMrRPyHxMyYY2j2E5FX0DhvbsFYNZjc7z4KjzEa1+obh5qf41WqA86UC HNmw== X-Forwarded-Encrypted: i=1; AJvYcCVSw5gk2Z3fvFcNJFDCK9Mzsf1CTp4MR7dJwNbDCualdUAGZkf90FiRBRyo0AMknavlKJmPlBygTE4QDM2t2hiaOmwynKLWybKrKKMrLcYPRtweNvo= X-Gm-Message-State: AOJu0Yy7RYyM3HWNMKr3WNwxX+lemsNH1oyFxvL1WrobqIG1pDuXIAtm Cbs5DrfsH7bb7EC2VXvqTcq88WhigE74tqeC6nhMvZB4jmCElGROsuLo71QKsw== X-Google-Smtp-Source: AGHT+IGXP64T7aTAPdkei1RXlp7A5rssNN997hjPGJuJA94RsOXciUbGOuoAzAwhs2/QCXjvj/Qa8w== X-Received: by 2002:a05:6a00:22d1:b0:70b:152:331 with SMTP id d2e1a72fcca58-70eaa936f64mr2043343b3a.21.1721881876962; Wed, 24 Jul 2024 21:31:16 -0700 (PDT) Received: from thinkpad ([103.244.168.26]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70ead812300sm343213b3a.114.2024.07.24.21.31.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Jul 2024 21:31:16 -0700 (PDT) Date: Thu, 25 Jul 2024 10:01:11 +0530 From: Manivannan Sadhasivam To: Jim Quinlan Cc: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Bjorn Helgaas , Lorenzo Pieralisi , Cyril Brulebois , Stanimir Varbanov , Krzysztof Kozlowski , bcm-kernel-feedback-list@broadcom.com, jim2101024@gmail.com, Florian Fainelli , Lorenzo Pieralisi , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Rob Herring , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , open list Subject: Re: [PATCH v4 03/12] PCI: brcmstb: Use common error handling code in brcm_pcie_probe() Message-ID: <20240725043111.GD2317@thinkpad> References: <20240716213131.6036-1-james.quinlan@broadcom.com> <20240716213131.6036-4-james.quinlan@broadcom.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240716213131.6036-4-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240724_213118_308609_113C6EC0 X-CRM114-Status: GOOD ( 21.63 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Jul 16, 2024 at 05:31:18PM -0400, Jim Quinlan wrote: > o Move the clk_prepare_enable() below the resource allocations. > o Add a jump target (clk_out) so that a bit of exception handling can be > better reused at the end of this function implementation. > > Signed-off-by: Jim Quinlan > Reviewed-by: Stanimir Varbanov > Reviewed-by: Florian Fainelli > --- > drivers/pci/controller/pcie-brcmstb.c | 29 +++++++++++++++------------ > 1 file changed, 16 insertions(+), 13 deletions(-) > > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > index c08683febdd4..c257434edc08 100644 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@ -1613,31 +1613,30 @@ static int brcm_pcie_probe(struct platform_device *pdev) > > pcie->ssc = of_property_read_bool(np, "brcm,enable-ssc"); > > - ret = clk_prepare_enable(pcie->clk); > - if (ret) { > - dev_err(&pdev->dev, "could not enable clock\n"); > - return ret; > - } > pcie->rescal = devm_reset_control_get_optional_shared(&pdev->dev, "rescal"); > - if (IS_ERR(pcie->rescal)) { > - clk_disable_unprepare(pcie->clk); > + if (IS_ERR(pcie->rescal)) > return PTR_ERR(pcie->rescal); > - } > + > pcie->perst_reset = devm_reset_control_get_optional_exclusive(&pdev->dev, "perst"); > - if (IS_ERR(pcie->perst_reset)) { > - clk_disable_unprepare(pcie->clk); > + if (IS_ERR(pcie->perst_reset)) > return PTR_ERR(pcie->perst_reset); > + > + ret = clk_prepare_enable(pcie->clk); > + if (ret) { > + dev_err(&pdev->dev, "could not enable clock\n"); > + return ret; > } > > ret = reset_control_reset(pcie->rescal); > - if (ret) > + if (ret) { > dev_err(&pdev->dev, "failed to deassert 'rescal'\n"); > + goto clk_out; Please use a descriptive name for the err labels. Here this err path disables and unprepares the clk, so use 'clk_disable_unprepare'. > + } > > ret = brcm_phy_start(pcie); > if (ret) { > reset_control_rearm(pcie->rescal); > - clk_disable_unprepare(pcie->clk); > - return ret; > + goto clk_out; > } > > ret = brcm_pcie_setup(pcie); > @@ -1676,6 +1675,10 @@ static int brcm_pcie_probe(struct platform_device *pdev) > > return 0; > > +clk_out: > + clk_disable_unprepare(pcie->clk); > + return ret; > + This is leaking the resources. Move this new label below 'fail'. - Mani -- மணிவண்ணன் சதாசிவம்