diff options
| author | Julia Lawall <julia@diku.dk> | 2008-04-11 10:09:24 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-04-29 02:52:45 -0400 |
| commit | 9030062f3d61f87c1e787b3aa134fa3a8e4b2d25 (patch) | |
| tree | a24cd60df75180ac54a115842be631bd3f3ed003 /drivers/misc | |
| parent | e9ae71078b2c8657c0e8de808b76b76049806906 (diff) | |
| download | talos-op-linux-9030062f3d61f87c1e787b3aa134fa3a8e4b2d25.tar.gz talos-op-linux-9030062f3d61f87c1e787b3aa134fa3a8e4b2d25.zip | |
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>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/intel_menlow.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/drivers/misc/intel_menlow.c b/drivers/misc/intel_menlow.c index 0c0bb3093e07..3db83a2dc3a1 100644 --- a/drivers/misc/intel_menlow.c +++ b/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; - - result = sysfs_create_link(&cdev->device.kobj, - &device->dev.kobj, "device"); - if (result) { - sysfs_remove_link(&device->dev.kobj, "thermal_cooling"); - goto unregister; - } - } + 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"); end: return result; |
