[PATCH] ACPI: Check whether cooling device exists before unregistering it

[PATCH] ACPI: Check whether cooling device exists before unregistering it

[Zhao Yakui]

Subject: ACPI:  Check whether cooling device exists before unregistering it
>From : Zhao Yakui <yakui.zhao@intel.com>

OS should check whether the cooling device exists before it is unregistered.
If it doesn't exists, it is unnecessary to remove the sysfs link
and call the function of thermal_cooling_device_unregister.

http://bugzilla.kernel.org/show_bug.cgi?id=9982

Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Tested-by    : Dhaval Giani <dhaval@linux.vnet.ibm.com>
    
---
 drivers/acpi/processor_core.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

Index: linux-2.6/drivers/acpi/processor_core.c
===================================================================
--- linux-2.6.orig/drivers/acpi/processor_core.c
+++ linux-2.6/drivers/acpi/processor_core.c
@@ -809,10 +809,12 @@ static int acpi_processor_remove(struct 
 
 	acpi_processor_remove_fs(device);
 
-	sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
-	sysfs_remove_link(&pr->cdev->device.kobj, "device");
-	thermal_cooling_device_unregister(pr->cdev);
-	pr->cdev = NULL;
+	if (pr->cdev) {
+		sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
+		sysfs_remove_link(&pr->cdev->device.kobj, "device");
+		thermal_cooling_device_unregister(pr->cdev);
+		pr->cdev = NULL;
+	}
 
 	processors[pr->id] = NULL;
 

Re: [PATCH] ACPI: Check whether cooling device exists before unregistering it

[Len Brown]

applied.

thanks,
-len

On Thursday 14 February 2008 19:34, Zhao Yakui wrote:
> Subject: ACPI:  Check whether cooling device exists before unregistering it
> >From : Zhao Yakui <yakui.zhao@intel.com>
> 
> OS should check whether the cooling device exists before it is unregistered.
> If it doesn't exists, it is unnecessary to remove the sysfs link
> and call the function of thermal_cooling_device_unregister.
> 
> http://bugzilla.kernel.org/show_bug.cgi?id=9982
> 
> Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
> Tested-by    : Dhaval Giani <dhaval@linux.vnet.ibm.com>
>     
> ---
>  drivers/acpi/processor_core.c |   10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> Index: linux-2.6/drivers/acpi/processor_core.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/processor_core.c
> +++ linux-2.6/drivers/acpi/processor_core.c
> @@ -809,10 +809,12 @@ static int acpi_processor_remove(struct 
>  
>  	acpi_processor_remove_fs(device);
>  
> -	sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
> -	sysfs_remove_link(&pr->cdev->device.kobj, "device");
> -	thermal_cooling_device_unregister(pr->cdev);
> -	pr->cdev = NULL;
> +	if (pr->cdev) {
> +		sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
> +		sysfs_remove_link(&pr->cdev->device.kobj, "device");
> +		thermal_cooling_device_unregister(pr->cdev);
> +		pr->cdev = NULL;
> +	}
>  
>  	processors[pr->id] = NULL;
>  
> 
>