From 6d1124ce237f38bcf9e574cfd72f018899d0ec03 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Mon, 22 Jun 2009 20:41:35 +0000 Subject: [PATCH] --- yaml --- r: 165261 b: refs/heads/master c: d02be04707b8ff5375a76c027327e8708877da39 h: refs/heads/master i: 165259: 48b452a35d166aa5e190c49556923960f33f1d09 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/ec.c | 19 +------------------ 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/[refs] b/[refs] index 6ecf92712293..aa1855e79ff9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5efc5476184173996dfcce780c2bb5e727df674e +refs/heads/master: d02be04707b8ff5375a76c027327e8708877da39 diff --git a/trunk/drivers/acpi/ec.c b/trunk/drivers/acpi/ec.c index 8b387a48e843..1feedcea2d40 100644 --- a/trunk/drivers/acpi/ec.c +++ b/trunk/drivers/acpi/ec.c @@ -838,9 +838,8 @@ static void ec_remove_handlers(struct acpi_ec *ec) static int acpi_ec_add(struct acpi_device *device) { struct acpi_ec *ec = NULL; + int ret; - if (!device) - return -EINVAL; strcpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME); strcpy(acpi_device_class(device), ACPI_EC_CLASS); @@ -875,21 +874,6 @@ static int acpi_ec_add(struct acpi_device *device) ec->gpe, ec->command_addr, ec->data_addr); pr_info(PREFIX "driver started in %s mode\n", (test_bit(EC_FLAGS_GPE_MODE, &ec->flags))?"interrupt":"poll"); - return 0; -} - -static int acpi_ec_start(struct acpi_device *device) -{ - struct acpi_ec *ec; - int ret = 0; - - if (!device) - return -EINVAL; - - ec = acpi_driver_data(device); - - if (!ec) - return -EINVAL; ret = ec_install_handlers(ec); @@ -1077,7 +1061,6 @@ static struct acpi_driver acpi_ec_driver = { .ops = { .add = acpi_ec_add, .remove = acpi_ec_remove, - .start = acpi_ec_start, .stop = acpi_ec_stop, .suspend = acpi_ec_suspend, .resume = acpi_ec_resume,