Merge branches 'acpi-extlog', 'acpi-memhotplug', 'acpi-button', 'acpi-tools' and...

[linux-2.6-microblaze.git] / drivers / acpi / acpi_memhotplug.c

diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c
index 9cd987d..ad6e90f 100644 (file)
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
@@ -29,11 +29,6 @@ static const struct acpi_device_id memory_device_ids[] = {
 
 #ifdef CONFIG_ACPI_HOTPLUG_MEMORY
 
-/* Memory Device States */
-#define MEMORY_INVALID_STATE   0
-#define MEMORY_POWER_ON_STATE  1
-#define MEMORY_POWER_OFF_STATE 2
-
 static int acpi_memory_device_add(struct acpi_device *device,
                                  const struct acpi_device_id *not_used);
 static void acpi_memory_device_remove(struct acpi_device *device);
@@ -57,8 +52,7 @@ struct acpi_memory_info {
 };
 
 struct acpi_memory_device {
-       struct acpi_device * device;
-       unsigned int state;     /* State of the memory device */
+       struct acpi_device *device;
        struct list_head res_list;
 };
 
@@ -226,7 +220,6 @@ static int acpi_memory_enable_device(struct acpi_memory_device *mem_device)
        }
        if (!num_enabled) {
                dev_err(&mem_device->device->dev, "add_memory failed\n");
-               mem_device->state = MEMORY_INVALID_STATE;
                return -EINVAL;
        }
        /*
@@ -297,9 +290,6 @@ static int acpi_memory_device_add(struct acpi_device *device,
                return result;
        }
 
-       /* Set the device state */
-       mem_device->state = MEMORY_POWER_ON_STATE;
-
        result = acpi_memory_check_device(mem_device);
        if (result) {
                acpi_memory_device_free(mem_device);