summaryrefslogtreecommitdiffstats
path: root/drivers/acpi/ec.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-10-22 23:28:38 -0400
committerLen Brown <len.brown@intel.com>2008-10-22 23:28:38 -0400
commit5f50ef453dcb05115fc98f244b8f10bfacd4b8b7 (patch)
tree1999a7e6d242198d48f0089c7995a50f339fa3e4 /drivers/acpi/ec.c
parent530bc23bfeaa9156003afbeb9708fd03a5f1c73c (diff)
parente3deda9c87ac5eef2b5d18cd0b5511370979ca26 (diff)
downloadlinux-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.tar.gz
linux-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.tar.bz2
linux-5f50ef453dcb05115fc98f244b8f10bfacd4b8b7.zip
Merge branch 'misc' into test
Diffstat (limited to 'drivers/acpi/ec.c')
-rw-r--r--drivers/acpi/ec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 4178d17aa0ed..40fefba6264e 100644
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -799,7 +799,7 @@ static int acpi_ec_add(struct acpi_device *device)
if (!first_ec)
first_ec = ec;
- acpi_driver_data(device) = ec;
+ device->driver_data = ec;
acpi_ec_add_fs(device);
pr_info(PREFIX "GPE = 0x%lx, I/O: command/status = 0x%lx, data = 0x%lx\n",
ec->gpe, ec->command_addr, ec->data_addr);
@@ -824,7 +824,7 @@ static int acpi_ec_remove(struct acpi_device *device, int type)
}
mutex_unlock(&ec->lock);
acpi_ec_remove_fs(device);
- acpi_driver_data(device) = NULL;
+ device->driver_data = NULL;
if (ec == first_ec)
first_ec = NULL;
kfree(ec);