diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2007-04-25 14:17:39 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-04-25 14:17:39 -0400 |
commit | a0bd4ac498acfe60f7533d15ba60d5efdd4e9ca5 (patch) | |
tree | 7b44633901a16fa0a1da34af0a1fa56e62c830d7 /drivers/acpi/container.c | |
parent | d8938801d10945ac2fbe0f41ded43f6276660a17 (diff) |
ACPI: Remove duplicate definitions for _STA bits
No need to duplicate the existing definitions in include/acpi/actypes.h.
syntax only -- no functional change.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/container.c')
-rw-r--r-- | drivers/acpi/container.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/acpi/container.c b/drivers/acpi/container.c index 0930d9413dfa..0dd3bf7c0ed1 100644 --- a/drivers/acpi/container.c +++ b/drivers/acpi/container.c | |||
@@ -49,8 +49,6 @@ MODULE_AUTHOR("Anil S Keshavamurthy"); | |||
49 | MODULE_DESCRIPTION("ACPI container driver"); | 49 | MODULE_DESCRIPTION("ACPI container driver"); |
50 | MODULE_LICENSE("GPL"); | 50 | MODULE_LICENSE("GPL"); |
51 | 51 | ||
52 | #define ACPI_STA_PRESENT (0x00000001) | ||
53 | |||
54 | static int acpi_container_add(struct acpi_device *device); | 52 | static int acpi_container_add(struct acpi_device *device); |
55 | static int acpi_container_remove(struct acpi_device *device, int type); | 53 | static int acpi_container_remove(struct acpi_device *device, int type); |
56 | 54 | ||
@@ -75,13 +73,13 @@ static int is_device_present(acpi_handle handle) | |||
75 | 73 | ||
76 | status = acpi_get_handle(handle, "_STA", &temp); | 74 | status = acpi_get_handle(handle, "_STA", &temp); |
77 | if (ACPI_FAILURE(status)) | 75 | if (ACPI_FAILURE(status)) |
78 | return 1; /* _STA not found, assmue device present */ | 76 | return 1; /* _STA not found, assume device present */ |
79 | 77 | ||
80 | status = acpi_evaluate_integer(handle, "_STA", NULL, &sta); | 78 | status = acpi_evaluate_integer(handle, "_STA", NULL, &sta); |
81 | if (ACPI_FAILURE(status)) | 79 | if (ACPI_FAILURE(status)) |
82 | return 0; /* Firmware error */ | 80 | return 0; /* Firmware error */ |
83 | 81 | ||
84 | return ((sta & ACPI_STA_PRESENT) == ACPI_STA_PRESENT); | 82 | return ((sta & ACPI_STA_DEVICE_PRESENT) == ACPI_STA_DEVICE_PRESENT); |
85 | } | 83 | } |
86 | 84 | ||
87 | /*******************************************************************/ | 85 | /*******************************************************************/ |