Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756915AbcDLKkx (ORCPT ); Tue, 12 Apr 2016 06:40:53 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:33005 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756273AbcDLKku (ORCPT ); Tue, 12 Apr 2016 06:40:50 -0400 From: Keguang Zhang To: linux-pm@vger.kernel.org, linux-mips@linux-mips.org, linux-kernel@vger.kernel.org Cc: "Rafael J. Wysocki" , Viresh Kumar , Kelvin Cheung Subject: [PATCH V1 5/5] cpufreq: Loongson1: Replace goto out with return in ls1x_cpufreq_probe() Date: Tue, 12 Apr 2016 18:40:19 +0800 Message-Id: <1460457619-14786-5-git-send-email-keguang.zhang@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1460457619-14786-1-git-send-email-keguang.zhang@gmail.com> References: <1460457619-14786-1-git-send-email-keguang.zhang@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2744 Lines: 98 From: Kelvin Cheung This patch replaces goto out with return in ls1x_cpufreq_probe(). Signed-off-by: Kelvin Cheung --- V1: Move the minor updates into patch#1. Fix the brace problem in ls1x_cpufreq_probe(). --- drivers/cpufreq/loongson1-cpufreq.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/drivers/cpufreq/loongson1-cpufreq.c b/drivers/cpufreq/loongson1-cpufreq.c index f0d0156..be89416 100644 --- a/drivers/cpufreq/loongson1-cpufreq.c +++ b/drivers/cpufreq/loongson1-cpufreq.c @@ -141,8 +141,10 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev) struct clk *clk; int ret; - if (!pdata || !pdata->clk_name || !pdata->osc_clk_name) + if (!pdata || !pdata->clk_name || !pdata->osc_clk_name) { + dev_err(&pdev->dev, "platform data missing\n"); return -EINVAL; + } cpufreq = devm_kzalloc(&pdev->dev, sizeof(struct ls1x_cpufreq), GFP_KERNEL); @@ -155,8 +157,7 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev) if (IS_ERR(clk)) { dev_err(&pdev->dev, "unable to get %s clock\n", pdata->clk_name); - ret = PTR_ERR(clk); - goto out; + return PTR_ERR(clk); } cpufreq->clk = clk; @@ -164,8 +165,7 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev) if (IS_ERR(clk)) { dev_err(&pdev->dev, "unable to get parent of %s clock\n", __clk_get_name(cpufreq->clk)); - ret = PTR_ERR(clk); - goto out; + return PTR_ERR(clk); } cpufreq->mux_clk = clk; @@ -173,8 +173,7 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev) if (IS_ERR(clk)) { dev_err(&pdev->dev, "unable to get parent of %s clock\n", __clk_get_name(cpufreq->mux_clk)); - ret = PTR_ERR(clk); - goto out; + return PTR_ERR(clk); } cpufreq->pll_clk = clk; @@ -182,8 +181,7 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev) if (IS_ERR(clk)) { dev_err(&pdev->dev, "unable to get %s clock\n", pdata->osc_clk_name); - ret = PTR_ERR(clk); - goto out; + return PTR_ERR(clk); } cpufreq->osc_clk = clk; @@ -194,19 +192,18 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev) if (ret) { dev_err(&pdev->dev, "failed to register CPUFreq driver: %d\n", ret); - goto out; + return ret; } ret = cpufreq_register_notifier(&ls1x_cpufreq_notifier_block, CPUFREQ_TRANSITION_NOTIFIER); - if (!ret) - goto out; - - dev_err(&pdev->dev, "failed to register cpufreq notifier: %d\n", ret); + if (ret) { + dev_err(&pdev->dev, + "failed to register CPUFreq notifier: %d\n",ret); + cpufreq_unregister_driver(&ls1x_cpufreq_driver); + } - cpufreq_unregister_driver(&ls1x_cpufreq_driver); -out: return ret; } -- 1.9.1