1 files changed, 10 insertions, 20 deletions

diff --git a/drivers/misc/intel_menlow.c b/drivers/misc/intel_menlow.c
index de16e88eb8d3..5bb8816c9126 100644
--- a/drivers/misc/intel_menlow.c
+++ b/drivers/misc/intel_menlow.c
@@ -175,28 +175,18 @@ 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;
-
- unregister:
-        thermal_cooling_device_unregister(cdev);
-        return result;
-
 }
 
 static int intel_menlow_memory_remove(struct acpi_device *device, int type)
@@ -213,7 +203,7 @@ static int intel_menlow_memory_remove(struct acpi_device *device, int type)
         return 0;
 }
 
-const static struct acpi_device_id intel_menlow_memory_ids[] = {
+static const struct acpi_device_id intel_menlow_memory_ids[] = {
         {"INT0002", 0},
         {"", 0},
 };