aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSeth Forshee <seth.forshee@canonical.com>2012-01-18 14:44:08 -0500
committerMatthew Garrett <mjg@redhat.com>2012-03-20 12:14:25 -0400
commit3e2abc5a35d25442821e1733687b7abbc83b5072 (patch)
treeb20d167e7211e8ac75000b0fbe27cf16abe121cf
parent7714567c87f43862d3d7049ed2907567be3e50c3 (diff)
ACPI: EC: Add ec_get_handle()
toshiba_acpi needs to execute an AML method within the EC namespace to make hotkeys work on some platforms. Provide an interface to allow it to easily get a handle to the EC namespace for this purpose. Signed-off-by: Seth Forshee <seth.forshee@canonical.com> Signed-off-by: Matthew Garrett <mjg@redhat.com>
-rw-r--r--drivers/acpi/ec.c10
-rw-r--r--include/linux/acpi.h1
2 files changed, 11 insertions, 0 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index b19a18dd994f..e37615f310d7 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -445,6 +445,16 @@ int ec_transaction(u8 command,
445 445
446EXPORT_SYMBOL(ec_transaction); 446EXPORT_SYMBOL(ec_transaction);
447 447
448/* Get the handle to the EC device */
449acpi_handle ec_get_handle(void)
450{
451 if (!first_ec)
452 return NULL;
453 return first_ec->handle;
454}
455
456EXPORT_SYMBOL(ec_get_handle);
457
448void acpi_ec_block_transactions(void) 458void acpi_ec_block_transactions(void)
449{ 459{
450 struct acpi_ec *ec = first_ec; 460 struct acpi_ec *ec = first_ec;
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 3f968665899b..f53fea61f40a 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -151,6 +151,7 @@ extern int ec_write(u8 addr, u8 val);
151extern int ec_transaction(u8 command, 151extern int ec_transaction(u8 command,
152 const u8 *wdata, unsigned wdata_len, 152 const u8 *wdata, unsigned wdata_len,
153 u8 *rdata, unsigned rdata_len); 153 u8 *rdata, unsigned rdata_len);
154extern acpi_handle ec_get_handle(void);
154 155
155#if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE) 156#if defined(CONFIG_ACPI_WMI) || defined(CONFIG_ACPI_WMI_MODULE)
156 157