ACPI: elide a non-zero test on a result that is never 0

thermal_cooling_device_register used to return NULL if THERMAL is "n".
As the ACPI fan, processor and video drivers SELECT the generic
thermal in PATCH 01, this is not a problem any more.

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>

1 files changed, 17 insertions, 18 deletions

diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c
index c8e3cba423ef..cf635cde836b 100644
--- a/drivers/acpi/fan.c
+++ b/drivers/acpi/fan.c
@@ -260,24 +260,23 @@ static int acpi_fan_add(struct acpi_device *device)
                 result = PTR_ERR(cdev);
                 goto end;
         }
-        if (cdev) {
-                printk(KERN_INFO PREFIX
-                        "%s is registered as cooling_device%d\n",
-                        device->dev.bus_id, cdev->id);
-
-                acpi_driver_data(device) = cdev;
-                result = sysfs_create_link(&device->dev.kobj,
-                                           &cdev->device.kobj,
-                                           "thermal_cooling");
-                if (result)
-                        return result;
-
-                result = sysfs_create_link(&cdev->device.kobj,
-                                           &device->dev.kobj,
-                                           "device");
-                if (result)
-                        return result;
-        }
+
+        printk(KERN_INFO PREFIX
+                "%s is registered as cooling_device%d\n",
+                device->dev.bus_id, cdev->id);
+
+        acpi_driver_data(device) = cdev;
+        result = sysfs_create_link(&device->dev.kobj,
+                                   &cdev->device.kobj,
+                                   "thermal_cooling");
+        if (result)
+                printk(KERN_ERR PREFIX "Create sysfs link\n");
+
+        result = sysfs_create_link(&cdev->device.kobj,
+                                   &device->dev.kobj,
+                                   "device");
+        if (result)
+                printk(KERN_ERR PREFIX "Create sysfs link\n");
 
         result = acpi_fan_add_fs(device);
         if (result)