diff options
| author | Patrick Mochel <mochel@linux.intel.com> | 2006-05-19 22:54:32 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-30 08:18:05 +0200 |
| commit | af96179a8298832cc58be212d0e4988d8a1e11bf (patch) | |
| tree | 50fe662d3ec549ea437d2be24b5fc419558b53d1 /drivers/acpi/ac.c | |
| parent | merge linus into release branch (diff) | |
| download | linux-af96179a8298832cc58be212d0e4988d8a1e11bf.tar.xz linux-af96179a8298832cc58be212d0e4988d8a1e11bf.zip | |
ACPI: ac: Add struct acpi_device to struct acpi_ac.
Signed-off-by: Patrick Mochel <mochel@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/ac.c')
| -rw-r--r-- | drivers/acpi/ac.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/ac.c b/drivers/acpi/ac.c index 36ca365bcead..206f56d2aa3a 100644 --- a/drivers/acpi/ac.c +++ b/drivers/acpi/ac.c @@ -66,6 +66,7 @@ static struct acpi_driver acpi_ac_driver = { struct acpi_ac { acpi_handle handle; + struct acpi_device * device; unsigned long state; }; @@ -191,9 +192,7 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data) if (!ac) return; - if (acpi_bus_get_device(ac->handle, &device)) - return; - + device = ac->device; switch (event) { case ACPI_AC_NOTIFY_STATUS: acpi_ac_get_state(ac); @@ -224,6 +223,7 @@ static int acpi_ac_add(struct acpi_device *device) memset(ac, 0, sizeof(struct acpi_ac)); ac->handle = device->handle; + ac->device = device; strcpy(acpi_device_name(device), ACPI_AC_DEVICE_NAME); strcpy(acpi_device_class(device), ACPI_AC_CLASS); acpi_driver_data(device) = ac; |