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>

drivers/acpi/fan.c

@@ -260,7 +260,7 @@ 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);
@@ -270,14 +270,13 @@ static int acpi_fan_add(struct acpi_device *device)
 				   &cdev->device.kobj,
 				   "thermal_cooling");
 	if (result)
-			return result;
+		printk(KERN_ERR PREFIX "Create sysfs link\n");
 
 	result = sysfs_create_link(&cdev->device.kobj,
 				   &device->dev.kobj,
 				   "device");
 	if (result)
-			return result;
-	}
+		printk(KERN_ERR PREFIX "Create sysfs link\n");
 
 	result = acpi_fan_add_fs(device);
 	if (result)

drivers/acpi/processor_core.c

@@ -674,7 +674,7 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
 		result = PTR_ERR(pr->cdev);
 		goto end;
 	}
-	if (pr->cdev) {
+
 	printk(KERN_INFO PREFIX
 		"%s is registered as cooling_device%d\n",
 		device->dev.bus_id, pr->cdev->id);
@@ -683,13 +683,12 @@ static int __cpuinit acpi_processor_start(struct acpi_device *device)
 				   &pr->cdev->device.kobj,
 				   "thermal_cooling");
 	if (result)
-			return result;
+		printk(KERN_ERR PREFIX "Create sysfs link\n");
 	result = sysfs_create_link(&pr->cdev->device.kobj,
 				   &device->dev.kobj,
 				   "device");
 	if (result)
-			return result;
-	}
+		printk(KERN_ERR PREFIX "Create sysfs link\n");
 
 	if (pr->flags.throttling) {
 		printk(KERN_INFO PREFIX "%s [%s] (supports",

drivers/acpi/video.c

@@ -734,7 +734,6 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
 		if (IS_ERR(device->cdev))
 			return;
 
-		if (device->cdev) {
 		printk(KERN_INFO PREFIX
 			"%s is registered as cooling_device%d\n",
 			device->dev->dev.bus_id, device->cdev->id);
@@ -744,11 +743,10 @@ static void acpi_video_device_find_cap(struct acpi_video_device *device)
 		if (result)
 			printk(KERN_ERR PREFIX "Create sysfs link\n");
 		result = sysfs_create_link(&device->cdev->device.kobj,
-					  &device->dev->dev.kobj,
-					  "device");
+				&device->dev->dev.kobj, "device");
 		if (result)
 			printk(KERN_ERR PREFIX "Create sysfs link\n");
-		}
+
 	}
 	if (device->cap._DCS && device->cap._DSS){
 		static int count = 0;

drivers/misc/intel_menlow.c

@@ -175,20 +175,15 @@ static int intel_menlow_memory_add(struct acpi_device *device)
 		goto end;
 	}
 
-	if (cdev) {
 	acpi_driver_data(device) = cdev;
 	result = sysfs_create_link(&device->dev.kobj,
 				&cdev->device.kobj, "thermal_cooling");
 	if (result)
-			goto unregister;
-
+		printk(KERN_ERR PREFIX "Create sysfs link\n");
 	result = sysfs_create_link(&cdev->device.kobj,
 				&device->dev.kobj, "device");
-		if (result) {
-			sysfs_remove_link(&device->dev.kobj, "thermal_cooling");
-			goto unregister;
-		}
-	}
+	if (result)
+		printk(KERN_ERR PREFIX "Create sysfs link\n");
 
  end:
 	return result;