From 058109cae3fa90548e9cc4a66021b7148c815322 Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Fri, 25 Jun 2010 01:20:38 +0200 Subject: [PATCH] --- yaml --- r: 206760 b: refs/heads/master c: b63559f5ce08bc8f94ce144a8d06f7af607ecc53 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/ec.c | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 9c881bfb4a61..afbf33cef358 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a44061aa8b5d58b2729faca4c155a94a5bea2a09 +refs/heads/master: b63559f5ce08bc8f94ce144a8d06f7af607ecc53 diff --git a/trunk/drivers/acpi/ec.c b/trunk/drivers/acpi/ec.c index bf5045416575..9bf7a7546bd4 100644 --- a/trunk/drivers/acpi/ec.c +++ b/trunk/drivers/acpi/ec.c @@ -1088,22 +1088,6 @@ int __init acpi_ec_ecdt_probe(void) return -ENODEV; } -static int acpi_ec_suspend(struct acpi_device *device, pm_message_t state) -{ - struct acpi_ec *ec = acpi_driver_data(device); - /* Stop using the GPE, but keep it reference counted. */ - acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_DISABLE); - return 0; -} - -static int acpi_ec_resume(struct acpi_device *device) -{ - struct acpi_ec *ec = acpi_driver_data(device); - /* Enable the GPE again, but don't reference count it once more. */ - acpi_set_gpe(NULL, ec->gpe, ACPI_GPE_ENABLE); - return 0; -} - static struct acpi_driver acpi_ec_driver = { .name = "ec", .class = ACPI_EC_CLASS, @@ -1111,8 +1095,6 @@ static struct acpi_driver acpi_ec_driver = { .ops = { .add = acpi_ec_add, .remove = acpi_ec_remove, - .suspend = acpi_ec_suspend, - .resume = acpi_ec_resume, }, };