diff options
Diffstat (limited to 'drivers/acpi/ec.c')
-rw-r--r-- | drivers/acpi/ec.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index ce1f07fd7241..a79e1b193e85 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c | |||
@@ -43,10 +43,13 @@ | |||
43 | #include <acpi/acpi_drivers.h> | 43 | #include <acpi/acpi_drivers.h> |
44 | #include <linux/dmi.h> | 44 | #include <linux/dmi.h> |
45 | 45 | ||
46 | #include "internal.h" | ||
47 | |||
46 | #define ACPI_EC_CLASS "embedded_controller" | 48 | #define ACPI_EC_CLASS "embedded_controller" |
47 | #define ACPI_EC_DEVICE_NAME "Embedded Controller" | 49 | #define ACPI_EC_DEVICE_NAME "Embedded Controller" |
48 | #define ACPI_EC_FILE_INFO "info" | 50 | #define ACPI_EC_FILE_INFO "info" |
49 | 51 | ||
52 | #undef PREFIX | ||
50 | #define PREFIX "ACPI: EC: " | 53 | #define PREFIX "ACPI: EC: " |
51 | 54 | ||
52 | /* EC status register */ | 55 | /* EC status register */ |
@@ -104,19 +107,8 @@ struct transaction { | |||
104 | bool done; | 107 | bool done; |
105 | }; | 108 | }; |
106 | 109 | ||
107 | static struct acpi_ec { | 110 | struct acpi_ec *boot_ec, *first_ec; |
108 | acpi_handle handle; | 111 | EXPORT_SYMBOL(first_ec); |
109 | unsigned long gpe; | ||
110 | unsigned long command_addr; | ||
111 | unsigned long data_addr; | ||
112 | unsigned long global_lock; | ||
113 | unsigned long flags; | ||
114 | struct mutex lock; | ||
115 | wait_queue_head_t wait; | ||
116 | struct list_head list; | ||
117 | struct transaction *curr; | ||
118 | spinlock_t curr_lock; | ||
119 | } *boot_ec, *first_ec; | ||
120 | 112 | ||
121 | static int EC_FLAGS_MSI; /* Out-of-spec MSI controller */ | 113 | static int EC_FLAGS_MSI; /* Out-of-spec MSI controller */ |
122 | static int EC_FLAGS_VALIDATE_ECDT; /* ASUStec ECDTs need to be validated */ | 114 | static int EC_FLAGS_VALIDATE_ECDT; /* ASUStec ECDTs need to be validated */ |