Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1376470

Re: [PATCH 5/5] cpufreq: Loongson1: Replace goto out with return in ls1x_cpufreq_probe()

Show all headers | View raw

On 11-04-16, 19:55, Keguang Zhang wrote:
> From: Kelvin Cheung <keguang.zhang@gmail.com>
> 
> This patch replaces goto out with return in ls1x_cpufreq_probe(),
> and also includes some minor fixes.
> 
> Signed-off-by: Kelvin Cheung <keguang.zhang@gmail.com>
> ---
>  drivers/cpufreq/loongson1-cpufreq.c | 37 ++++++++++++++++---------------------
>  1 file changed, 16 insertions(+), 21 deletions(-)
> 
> diff --git a/drivers/cpufreq/loongson1-cpufreq.c b/drivers/cpufreq/loongson1-cpufreq.c
> index 5074f5e..1bc90af 100644
> --- a/drivers/cpufreq/loongson1-cpufreq.c
> +++ b/drivers/cpufreq/loongson1-cpufreq.c
> @@ -1,7 +1,7 @@
>  /*
>   * CPU Frequency Scaling for Loongson 1 SoC
>   *
> - * Copyright (C) 2014 Zhang, Keguang <keguang.zhang@gmail.com>
> + * Copyright (C) 2014-2016 Zhang, Keguang <keguang.zhang@gmail.com>

Actually you should fold above into the first patch of the series,
that renames this file. It makes much sense that way.

>   *
>   * This file is licensed under the terms of the GNU General Public
>   * License version 2. This program is licensed "as is" without any
> @@ -141,7 +141,8 @@ 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) {

You added a '{' here, but the closing '}' is added way down..
Something is wrong here I feel..

> +		dev_err(&pdev->dev, "platform data missing\n");
>  		return -EINVAL;
>  
>  	cpufreq =
> @@ -155,8 +156,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);
>  	}

>  static struct platform_driver ls1x_cpufreq_platdrv = {
> -	.driver = {
> +	.probe	= ls1x_cpufreq_probe,
> +	.remove	= ls1x_cpufreq_remove,
> +	.driver	= {
>  		.name	= "ls1x-cpufreq",
>  	},
> -	.probe		= ls1x_cpufreq_probe,
> -	.remove		= ls1x_cpufreq_remove,

Why do this change at all? Do it in the first patch if you really want
to.

>  };
>  
>  module_platform_driver(ls1x_cpufreq_platdrv);
>  
>  MODULE_AUTHOR("Kelvin Cheung <keguang.zhang@gmail.com>");
> -MODULE_DESCRIPTION("Loongson 1 CPUFreq driver");
> +MODULE_DESCRIPTION("Loongson1 CPUFreq driver");

This one as well, move it to the first patch.

>  MODULE_LICENSE("GPL");
> -- 
> 1.9.1

-- 
viresh

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/5] cpufreq: Loongson1: Rename the file to loongson1-cpufreq.c Keguang Zhang <keguang.zhang@gmail.com> - 2016-04-11 14:00 +0200
  [PATCH 3/5] cpufreq: Loongson1: Use dev_get_platdata() to get platform_data Keguang Zhang <keguang.zhang@gmail.com> - 2016-04-11 14:00 +0200
    Re: [PATCH 3/5] cpufreq: Loongson1: Use dev_get_platdata() to get  platform_data Viresh Kumar <viresh.kumar@linaro.org> - 2016-04-12 07:20 +0200
  [PATCH 5/5] cpufreq: Loongson1: Replace goto out with return in ls1x_cpufreq_probe() Keguang Zhang <keguang.zhang@gmail.com> - 2016-04-11 14:00 +0200
    Re: [PATCH 5/5] cpufreq: Loongson1: Replace goto out with return in  ls1x_cpufreq_probe() Viresh Kumar <viresh.kumar@linaro.org> - 2016-04-12 07:30 +0200
  [PATCH 4/5] cpufreq: Loongson1: Use devm_kzalloc() instead of global structure Keguang Zhang <keguang.zhang@gmail.com> - 2016-04-11 14:00 +0200
    Re: [PATCH 4/5] cpufreq: Loongson1: Use devm_kzalloc() instead of  global structure Viresh Kumar <viresh.kumar@linaro.org> - 2016-04-12 07:30 +0200
  Re: [PATCH 1/5] cpufreq: Loongson1: Rename the file to  loongson1-cpufreq.c Viresh Kumar <viresh.kumar@linaro.org> - 2016-04-12 07:20 +0200

csiph-web