Re: [PATCH 15/21] cpuidle: free all state kobjects from cpuidle_free_state_kobj()

[Daniel Lezcano]

On 09/22/2013 03:21 AM, Viresh Kumar wrote:
> Loop for states is currently present on callers side and so is replicated at
> several places. It would be better to move that inside 
> cpuidle_free_state_kobj()
> instead.
> 
> This patch does it.
> 
> Signed-off-by: Viresh Kumar 

Acked-by: Daniel Lezcano 

> ---
>  drivers/cpuidle/sysfs.c | 23 ---
>  1 file changed, 12 insertions(+), 11 deletions(-)
> 
> diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
> index e918b6d..ade31a9 100644
> --- a/drivers/cpuidle/sysfs.c
> +++ b/drivers/cpuidle/sysfs.c
> @@ -378,12 +378,17 @@ static struct kobj_type ktype_state_cpuidle = {
>   .release = cpuidle_state_sysfs_release,
>  };
>  
> -static inline void cpuidle_free_state_kobj(struct cpuidle_device *device, 
> int i)
> +static inline void cpuidle_free_state_kobj(struct cpuidle_device *device,
> + int count)
>  {
> - kobject_put(&device->kobjs[i]->kobj);
> - wait_for_completion(&device->kobjs[i]->kobj_unregister);
> - kfree(device->kobjs[i]);
> - device->kobjs[i] = NULL;
> + int i;
> +
> + for (i = 0; i < count; i++) {
> + kobject_put(&device->kobjs[i]->kobj);
> + wait_for_completion(&device->kobjs[i]->kobj_unregister);
> + kfree(device->kobjs[i]);
> + device->kobjs[i] = NULL;
> + }
>  }
>  
>  /**
> @@ -419,8 +424,7 @@ static int cpuidle_add_state_sysfs(struct cpuidle_device 
> *device)
>   return 0;
>  
>  error_state:
> - for (i = i - 1; i >= 0; i--)
> - cpuidle_free_state_kobj(device, i);
> + cpuidle_free_state_kobj(device, i);
>   return ret;
>  }
>  
> @@ -430,10 +434,7 @@ error_state:
>   */
>  static void cpuidle_remove_state_sysfs(struct cpuidle_device *device)
>  {
> - int i;
> -
> - for (i = 0; i < device->state_count; i++)
> - cpuidle_free_state_kobj(device, i);
> + cpuidle_free_state_kobj(device, device->state_count);
>  }
>  
>  #ifdef CONFIG_CPU_IDLE_MULTIPLE_DRIVERS
> 


-- 
  Linaro.org │ Open source software for ARM SoCs

Follow Linaro:   Facebook |
 Twitter |
 Blog

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH 15/21] cpuidle: free all state kobjects from cpuidle_free_state_kobj()

[Viresh Kumar]

Loop for states is currently present on callers side and so is replicated at
several places. It would be better to move that inside cpuidle_free_state_kobj()
instead.

This patch does it.

Signed-off-by: Viresh Kumar 
---
 drivers/cpuidle/sysfs.c | 23 ---
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/drivers/cpuidle/sysfs.c b/drivers/cpuidle/sysfs.c
index e918b6d..ade31a9 100644
--- a/drivers/cpuidle/sysfs.c
+++ b/drivers/cpuidle/sysfs.c
@@ -378,12 +378,17 @@ static struct kobj_type ktype_state_cpuidle = {
.release = cpuidle_state_sysfs_release,
 };
 
-static inline void cpuidle_free_state_kobj(struct cpuidle_device *device, int 
i)
+static inline void cpuidle_free_state_kobj(struct cpuidle_device *device,
+   int count)
 {
-   kobject_put(&device->kobjs[i]->kobj);
-   wait_for_completion(&device->kobjs[i]->kobj_unregister);
-   kfree(device->kobjs[i]);
-   device->kobjs[i] = NULL;
+   int i;
+
+   for (i = 0; i < count; i++) {
+   kobject_put(&device->kobjs[i]->kobj);
+   wait_for_completion(&device->kobjs[i]->kobj_unregister);
+   kfree(device->kobjs[i]);
+   device->kobjs[i] = NULL;
+   }
 }
 
 /**
@@ -419,8 +424,7 @@ static int cpuidle_add_state_sysfs(struct cpuidle_device 
*device)
return 0;
 
 error_state:
-   for (i = i - 1; i >= 0; i--)
-   cpuidle_free_state_kobj(device, i);
+   cpuidle_free_state_kobj(device, i);
return ret;
 }
 
@@ -430,10 +434,7 @@ error_state:
  */
 static void cpuidle_remove_state_sysfs(struct cpuidle_device *device)
 {
-   int i;
-
-   for (i = 0; i < device->state_count; i++)
-   cpuidle_free_state_kobj(device, i);
+   cpuidle_free_state_kobj(device, device->state_count);
 }
 
 #ifdef CONFIG_CPU_IDLE_MULTIPLE_DRIVERS
-- 
1.7.12.rc2.18.g61b472e

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/