> And the return value of thermal_zone_device_register is also misused.
Indeed, I missed that one.
julia
> How about this refreshed patch? :)
>
>
> Check the return value of thermal zone/cooling device registration correctly.
>
> Signed-off-by: Zhang Rui <rui.zhang@xxxxxxxxx>
> ---
> drivers/acpi/fan.c | 3 +--
> drivers/acpi/processor_core.c | 3 +--
> drivers/acpi/thermal.c | 2 +-
> drivers/acpi/video.c | 3 +--
> drivers/misc/intel_menlow.c | 4 +---
> 5 files changed, 5 insertions(+), 10 deletions(-)
>
> Index: linux-2.6/drivers/acpi/fan.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/fan.c
> +++ linux-2.6/drivers/acpi/fan.c
> @@ -259,8 +259,7 @@ static int acpi_fan_add(struct acpi_devi
> if (IS_ERR(cdev)) {
> result = PTR_ERR(cdev);
> goto end;
> - }
> - if (cdev) {
> + } else {
> printk(KERN_INFO PREFIX
> "%s is registered as cooling_device%d\n",
> device->dev.bus_id, cdev->id);
> 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
> @@ -673,8 +673,7 @@ static int __cpuinit acpi_processor_star
> if (IS_ERR(pr->cdev)) {
> result = PTR_ERR(pr->cdev);
> goto end;
> - }
> - if (pr->cdev) {
> + } else {
> printk(KERN_INFO PREFIX
> "%s is registered as cooling_device%d\n",
> device->dev.bus_id, pr->cdev->id);
> Index: linux-2.6/drivers/acpi/thermal.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/thermal.c
> +++ linux-2.6/drivers/acpi/thermal.c
> @@ -1125,7 +1125,7 @@ static int acpi_thermal_register_thermal
> tz->trips.active[i].flags.valid; i++, trips++);
> tz->thermal_zone = thermal_zone_device_register("ACPI thermal zone",
> trips, tz, &acpi_thermal_zone_ops);
> - if (!tz->thermal_zone)
> + if (IS_ERR(tz->thermal_zone))
> return -ENODEV;
>
> result = sysfs_create_link(&tz->device->dev.kobj,
> Index: linux-2.6/drivers/acpi/video.c
> ===================================================================
> --- linux-2.6.orig/drivers/acpi/video.c
> +++ linux-2.6/drivers/acpi/video.c
> @@ -733,8 +733,7 @@ static void acpi_video_device_find_cap(s
> device->dev, &video_cooling_ops);
> if (IS_ERR(device->cdev))
> return;
> -
> - if (device->cdev) {
> + else {
> printk(KERN_INFO PREFIX
> "%s is registered as cooling_device%d\n",
> device->dev->dev.bus_id, device->cdev->id);
> Index: linux-2.6/drivers/misc/intel_menlow.c
> ===================================================================
> --- linux-2.6.orig/drivers/misc/intel_menlow.c
> +++ linux-2.6/drivers/misc/intel_menlow.c
> @@ -173,9 +173,7 @@ static int intel_menlow_memory_add(struc
> if (IS_ERR(cdev)) {
> result = PTR_ERR(cdev);
> goto end;
> - }
> -
> - if (cdev) {
> + } else {
> acpi_driver_data(device) = cdev;
> result = sysfs_create_link(&device->dev.kobj,
> &cdev->device.kobj, "thermal_cooling");
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
