Re: [PATCH 3/5] cpufreq: remove __cpufreq_remove_dev()

["Srivatsa S. Bhat" <srivatsa.bhat@linux.vnet.ibm.com>]

On 09/12/2013 10:55 AM, Viresh Kumar wrote:
> Nobody except cpufreq_remove_dev() is calling __cpufreq_remove_dev() and so we
> don't need separate routines here. Lets merge code from __cpufreq_remove_dev()
> to cpufreq_remove_dev() and get rid of __cpufreq_remove_dev().
> 
> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

Reviewed-by: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>

Regards,
Srivatsa S. Bhat

> ---
>  drivers/cpufreq/cpufreq.c | 26 ++++++++------------------
>  1 file changed, 8 insertions(+), 18 deletions(-)
> 
> diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
> index 31f7845..5e0a82e 100644
> --- a/drivers/cpufreq/cpufreq.c
> +++ b/drivers/cpufreq/cpufreq.c
> @@ -1285,36 +1285,26 @@ static int __cpufreq_remove_dev_finish(struct device *dev,
>  }
> 
>  /**
> - * __cpufreq_remove_dev - remove a CPU device
> + * cpufreq_remove_dev - remove a CPU device
>   *
>   * Removes the cpufreq interface for a CPU device.
>   * Caller should already have policy_rwsem in write mode for this CPU.
>   * This routine frees the rwsem before returning.
>   */
> -static inline int __cpufreq_remove_dev(struct device *dev,
> -				       struct subsys_interface *sif,
> -				       bool frozen)
> -{
> -	int ret;
> -
> -	ret = __cpufreq_remove_dev_prepare(dev, sif, frozen);
> -
> -	if (!ret)
> -		ret = __cpufreq_remove_dev_finish(dev, sif, frozen);
> -
> -	return ret;
> -}
> -
>  static int cpufreq_remove_dev(struct device *dev, struct subsys_interface *sif)
>  {
>  	unsigned int cpu = dev->id;
> -	int retval;
> +	int ret;
> 
>  	if (cpu_is_offline(cpu))
>  		return 0;
> 
> -	retval = __cpufreq_remove_dev(dev, sif, false);
> -	return retval;
> +	ret = __cpufreq_remove_dev_prepare(dev, sif, false);
> +
> +	if (!ret)
> +		ret = __cpufreq_remove_dev_finish(dev, sif, false);
> +
> +	return ret;
>  }
> 
>  static void handle_update(struct work_struct *work)
>