diff options
| author | Len Brown <len.brown@intel.com> | 2011-05-29 04:40:39 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-05-29 04:40:39 -0400 |
| commit | 751516f0a9bad32544f40f471037c0e45fb639c9 (patch) | |
| tree | 8bdd745909a1523f720ae978c12b9c686d58baaa /drivers/acpi | |
| parent | 6288cf1e768ae73db5ddaaae54d85245cc1c2b56 (diff) | |
| parent | 08b53f0e6b565fe8dc0b8f929960ed16d76291bd (diff) | |
Merge branch 'ec-cleanup' into release
Conflicts:
drivers/platform/x86/compal-laptop.c
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/ec.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 0b954c6702be..b19a18dd994f 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -69,7 +69,6 @@ enum ec_command { #define ACPI_EC_DELAY 500 /* Wait 500ms max. during EC ops */ #define ACPI_EC_UDELAY_GLK 1000 /* Wait 1ms max. to get global lock */ -#define ACPI_EC_CDELAY 10 /* Wait 10us before polling EC */ #define ACPI_EC_MSI_UDELAY 550 /* Wait 550us for MSI EC */ #define ACPI_EC_STORM_THRESHOLD 8 /* number of false interrupts @@ -433,8 +432,7 @@ EXPORT_SYMBOL(ec_write); int ec_transaction(u8 command, const u8 * wdata, unsigned wdata_len, - u8 * rdata, unsigned rdata_len, - int force_poll) + u8 * rdata, unsigned rdata_len) { struct transaction t = {.command = command, .wdata = wdata, .rdata = rdata, @@ -592,8 +590,6 @@ static void acpi_ec_gpe_query(void *ec_cxt) mutex_unlock(&ec->lock); } -static void acpi_ec_gpe_query(void *ec_cxt); - static int ec_check_sci(struct acpi_ec *ec, u8 state) { if (state & ACPI_EC_FLAG_SCI) { @@ -808,8 +804,6 @@ static int acpi_ec_add(struct acpi_device *device) return -EINVAL; } - ec->handle = device->handle; - /* Find and register all query methods */ acpi_walk_namespace(ACPI_TYPE_METHOD, ec->handle, 1, acpi_ec_register_query_methods, NULL, ec, NULL); |