diff options
| author | Len Brown <len.brown@intel.com> | 2007-04-29 05:12:03 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-04-29 05:12:03 +0200 |
| commit | fb16596997ded3e70d308bec58e32c1e2c5cf9b0 (patch) | |
| tree | 28939b49c26e51d2c22047ef2e07f4b1d6352bbb /drivers/acpi/acpi_memhotplug.c | |
| parent | Pull thinkpad into release branch (diff) | |
| parent | ACPI: Remove a warning about unused variable in !CONFIG_ACPI compilation. (diff) | |
| download | linux-fb16596997ded3e70d308bec58e32c1e2c5cf9b0.tar.xz linux-fb16596997ded3e70d308bec58e32c1e2c5cf9b0.zip | |
Pull misc-for-upstream into release branch
Diffstat (limited to 'drivers/acpi/acpi_memhotplug.c')
| -rw-r--r-- | drivers/acpi/acpi_memhotplug.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index c26172671fd8..e65628a03085 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c @@ -44,11 +44,6 @@ MODULE_AUTHOR("Naveen B S <naveen.b.s@intel.com>"); MODULE_DESCRIPTION("Hotplug Mem Driver"); MODULE_LICENSE("GPL"); -/* ACPI _STA method values */ -#define ACPI_MEMORY_STA_PRESENT (0x00000001UL) -#define ACPI_MEMORY_STA_ENABLED (0x00000002UL) -#define ACPI_MEMORY_STA_FUNCTIONAL (0x00000008UL) - /* Memory Device States */ #define MEMORY_INVALID_STATE 0 #define MEMORY_POWER_ON_STATE 1 @@ -204,9 +199,9 @@ static int acpi_memory_check_device(struct acpi_memory_device *mem_device) * Check for device status. Device should be * present/enabled/functioning. */ - if (!((current_status & ACPI_MEMORY_STA_PRESENT) - && (current_status & ACPI_MEMORY_STA_ENABLED) - && (current_status & ACPI_MEMORY_STA_FUNCTIONAL))) + if (!((current_status & ACPI_STA_DEVICE_PRESENT) + && (current_status & ACPI_STA_DEVICE_ENABLED) + && (current_status & ACPI_STA_DEVICE_FUNCTIONING))) return -ENODEV; return 0; @@ -286,7 +281,7 @@ static int acpi_memory_powerdown_device(struct acpi_memory_device *mem_device) return -ENODEV; /* Check for device status. Device should be disabled */ - if (current_status & ACPI_MEMORY_STA_ENABLED) + if (current_status & ACPI_STA_DEVICE_ENABLED) return -EINVAL; return 0; |