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 8CC51C3DA4A for ; Fri, 16 Aug 2024 07:03:47 +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=/2Z+3RNB2QpPIGic+9pjYyfWRgiiZ2uqgv5Hgxzn04Y=; b=tDkoh+1HK8dW3iqHzZ1SrKejQq XiAZMg+pw9fn2cs724bINtwcJyVsACqUCMw1VZTGQwAe55zsJos38fpWWU+NjFMQ+8MqndiQ3gfMP O5VYAqNMm2FZRi+SXj1u/YToyW0KAO1AgJ6Dz1WqJx3lqU3CJ9AIJfAFbb5dznBp4DQUGLPXpXCHn K2uWGn2H6uBYqzEBISByXRnLMwZc6ikWjv7uwNOwhtkUNuQn44m7pVxxQ2RjDm9PXyZEgKLHB3reJ W/UtWDchskPnz6cur06B1nE07flObI0US0Br7TOkmkhNutEU8ozuqGAmThVy2TCxF3KJDr0z/Nf5g UKkHB5bQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1seqzk-0000000C16t-0hbw; Fri, 16 Aug 2024 07:03:32 +0000 Received: from mail-oa1-x30.google.com ([2001:4860:4864:20::30]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1seqz4-0000000C0yY-2QPh for linux-arm-kernel@lists.infradead.org; Fri, 16 Aug 2024 07:02:52 +0000 Received: by mail-oa1-x30.google.com with SMTP id 586e51a60fabf-2689e7a941fso1245317fac.3 for ; Fri, 16 Aug 2024 00:02:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1723791769; x=1724396569; 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=/2Z+3RNB2QpPIGic+9pjYyfWRgiiZ2uqgv5Hgxzn04Y=; b=FqjEnakvE0KhJV8BFeDHodDEM0gSVTYl+xeaSBFSKoyZ+7BQfjtk1K8QTaClUZ9PUU rqtSMhJr1DGC6hkZXNcGwzLD2n+Qoaads4ZkowFflqVD8uMNPhVQ7DGLSt/ad5ejY6ti 5JMe6XW9L114FDC77ngROEYg/rFac0hDfBspAVmwO910s6IhNqGr75uedXbWN4TKjnfK 7lbM8Pe7aiyPgeBGWFbGu6m8+qVFThNOzRAe4AWAn+vwWEEDDj2EEnP/I5BFo0SFPh4p woDyV7IkFRy69MGyOVNYTp4B1YhdL8NLQg+jgFR1yq/9yGAYq5TmgRxcMsQ6rRmwvT19 l1LQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723791769; x=1724396569; 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=/2Z+3RNB2QpPIGic+9pjYyfWRgiiZ2uqgv5Hgxzn04Y=; b=V1LoP02G6lv+TZNVUWj9kE6Y1ooopgCV+CK3NiHgY3AWmfrUS+J2wHrwAnWiGeuibq 7vK94GpVIUkjGGy21gQ7veIN1UcLhIzdyT0Rm0XB8ZHSVMcCnnPxVUxIupQ9VVXv2ZuC KWgh2zwYHXBvjLuhNypopqKFqfBqrEp43krGs3xcCmbNMRe6suTSo8lBHqAz79uwIg45 nilseu8JSb04HNwapBxEeAqGccl2mHldNN0A2JRhhFHd8q4WK/KjYQv1qu+lcy0l66/X cP9WlcNLvrlMCuDDWEjxpdqKn0PE+I0bL1gW3UNARIDEnsrQ+Rx+6y98r4PdlWupK0ST QBKg== X-Forwarded-Encrypted: i=1; AJvYcCUGt3gUu2+sz3hV7AznWS5r9Csec7Yr4LAUgekOThohkI4jT7ZXQECxj44hxZndvpg4V3b4OWV7ZsLfnU1zTyiAEvl1RqiIsa08L80af8ufHn/Fp44= X-Gm-Message-State: AOJu0YzVOPLiM9tp+opiOb/KFMWWlqyl1uLCLhLBbrQbEtsaeU9B2xAx KsQPfrJjJuU4Zq1qneX2tHrzurQJJc8j4FOxhgQMwtUIiiOboAoZC3SM3l9h4Q== X-Google-Smtp-Source: AGHT+IFNDYdQwGyEIqqhP9q7fz+e2TnS80Sfaxe+R84yxpxfEKiriLW+niboArdJkp12iogF4qfi0w== X-Received: by 2002:a05:6871:6108:b0:261:1e3f:777c with SMTP id 586e51a60fabf-2701c3deca1mr2054038fac.27.1723791769013; Fri, 16 Aug 2024 00:02:49 -0700 (PDT) Received: from thinkpad ([36.255.17.34]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7127af1708asm2031815b3a.154.2024.08.16.00.02.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 00:02:48 -0700 (PDT) Date: Fri, 16 Aug 2024 12:32:42 +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 , Philipp Zabel , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , open list Subject: Re: [PATCH v6 04/13] PCI: brcmstb: Use common error handling code in brcm_pcie_probe() Message-ID: <20240816070242.GI2331@thinkpad> References: <20240815225731.40276-1-james.quinlan@broadcom.com> <20240815225731.40276-5-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: <20240815225731.40276-5-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240816_000250_667565_4F541CAA X-CRM114-Status: GOOD ( 21.15 ) 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 Thu, Aug 15, 2024 at 06:57:17PM -0400, Jim Quinlan wrote: > Refactor the error handling in the bottom half of the probe > function for readability. The invocation of clk_prepare_enable() > is moved lower in the function and this simplifies a couple > of return paths. dev_err_probe() is also used when it is apt. > > Signed-off-by: Jim Quinlan Reviewed-by: Manivannan Sadhasivam > --- > drivers/pci/controller/pcie-brcmstb.c | 25 ++++++++++++------------- > 1 file changed, 12 insertions(+), 13 deletions(-) > > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > index c08683febdd4..790a149f6581 100644 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@ -1613,25 +1613,23 @@ 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 = reset_control_reset(pcie->rescal); > + ret = clk_prepare_enable(pcie->clk); > if (ret) > - dev_err(&pdev->dev, "failed to deassert 'rescal'\n"); > + return dev_err_probe(&pdev->dev, ret, "could not enable clock\n"); > + > + ret = reset_control_reset(pcie->rescal); > + if (ret) { > + clk_disable_unprepare(pcie->clk); > + return dev_err_probe(&pdev->dev, ret, "failed to deassert 'rescal'\n"); > + } > > ret = brcm_phy_start(pcie); > if (ret) { > @@ -1678,6 +1676,7 @@ static int brcm_pcie_probe(struct platform_device *pdev) > > fail: > __brcm_pcie_remove(pcie); > + Irrelevant change in this patch. - Mani > return ret; > } > > -- > 2.17.1 > -- மணிவண்ணன் சதாசிவம்