iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CPUFREQ: Loongson1: Replace goto out with return in ls1x_cpufreq_probe()

Browse Source 
This patch replaces goto out with return in ls1x_cpufreq_probe().

Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: linux-pm@vger.kernel.org
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/13056/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Kelvin Cheung 2016-04-12 18:40:19 +08:00 committed by Ralf Baechle
parent 99bf2e6898
commit 65b2849a02
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/cpufreq/loongson1-cpufreq.c
View File

@ -141,8 +141,10 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev)
struct clk *clk; struct clk *clk;
int ret; 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; return -EINVAL;
}
cpufreq = cpufreq =
devm_kzalloc(&pdev->dev, sizeof(struct ls1x_cpufreq), GFP_KERNEL); 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)) { if (IS_ERR(clk)) {
dev_err(&pdev->dev, "unable to get %s clock\n", dev_err(&pdev->dev, "unable to get %s clock\n",
pdata->clk_name); pdata->clk_name);
ret = PTR_ERR(clk); return PTR_ERR(clk);
goto out;
} }
cpufreq->clk = clk; cpufreq->clk = clk;
@ -164,8 +165,7 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev)
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
dev_err(&pdev->dev, "unable to get parent of %s clock\n", dev_err(&pdev->dev, "unable to get parent of %s clock\n",
__clk_get_name(cpufreq->clk)); __clk_get_name(cpufreq->clk));
ret = PTR_ERR(clk); return PTR_ERR(clk);
goto out;
} }
cpufreq->mux_clk = clk; cpufreq->mux_clk = clk;
@ -173,8 +173,7 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev)
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
dev_err(&pdev->dev, "unable to get parent of %s clock\n", dev_err(&pdev->dev, "unable to get parent of %s clock\n",
__clk_get_name(cpufreq->mux_clk)); __clk_get_name(cpufreq->mux_clk));
ret = PTR_ERR(clk); return PTR_ERR(clk);
goto out;
} }
cpufreq->pll_clk = clk; cpufreq->pll_clk = clk;
@ -182,8 +181,7 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev)
if (IS_ERR(clk)) { if (IS_ERR(clk)) {
dev_err(&pdev->dev, "unable to get %s clock\n", dev_err(&pdev->dev, "unable to get %s clock\n",
pdata->osc_clk_name); pdata->osc_clk_name);
ret = PTR_ERR(clk); return PTR_ERR(clk);
goto out;
} }
cpufreq->osc_clk = clk; cpufreq->osc_clk = clk;
@ -194,19 +192,18 @@ static int ls1x_cpufreq_probe(struct platform_device *pdev)
if (ret) { if (ret) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"failed to register CPUFreq driver: %d\n", ret); "failed to register CPUFreq driver: %d\n", ret);
goto out; return ret;
} }
ret = cpufreq_register_notifier(&ls1x_cpufreq_notifier_block, ret = cpufreq_register_notifier(&ls1x_cpufreq_notifier_block,
CPUFREQ_TRANSITION_NOTIFIER); CPUFREQ_TRANSITION_NOTIFIER);
if (!ret) if (ret) {
goto out; dev_err(&pdev->dev,
"failed to register CPUFreq notifier: %d\n",ret);
cpufreq_unregister_driver(&ls1x_cpufreq_driver);
}
dev_err(&pdev->dev, "failed to register cpufreq notifier: %d\n", ret);
cpufreq_unregister_driver(&ls1x_cpufreq_driver);
out:
return ret; return ret;
} }