diff options
author | Patrick Mochel <mochel@linux.intel.com> | 2006-05-19 16:54:32 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2006-06-30 02:18:05 -0400 |
commit | af96179a8298832cc58be212d0e4988d8a1e11bf (patch) | |
tree | 50fe662d3ec549ea437d2be24b5fc419558b53d1 /drivers/acpi | |
parent | d120cfb544ed6161b9d32fb6c4648c471807ee6b (diff) |
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')
-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 = { | |||
66 | 66 | ||
67 | struct acpi_ac { | 67 | struct acpi_ac { |
68 | acpi_handle handle; | 68 | acpi_handle handle; |
69 | struct acpi_device * device; | ||
69 | unsigned long state; | 70 | unsigned long state; |
70 | }; | 71 | }; |
71 | 72 | ||
@@ -191,9 +192,7 @@ static void acpi_ac_notify(acpi_handle handle, u32 event, void *data) | |||
191 | if (!ac) | 192 | if (!ac) |
192 | return; | 193 | return; |
193 | 194 | ||
194 | if (acpi_bus_get_device(ac->handle, &device)) | 195 | device = ac->device; |
195 | return; | ||
196 | |||
197 | switch (event) { | 196 | switch (event) { |
198 | case ACPI_AC_NOTIFY_STATUS: | 197 | case ACPI_AC_NOTIFY_STATUS: |
199 | acpi_ac_get_state(ac); | 198 | acpi_ac_get_state(ac); |
@@ -224,6 +223,7 @@ static int acpi_ac_add(struct acpi_device *device) | |||
224 | memset(ac, 0, sizeof(struct acpi_ac)); | 223 | memset(ac, 0, sizeof(struct acpi_ac)); |
225 | 224 | ||
226 | ac->handle = device->handle; | 225 | ac->handle = device->handle; |
226 | ac->device = device; | ||
227 | strcpy(acpi_device_name(device), ACPI_AC_DEVICE_NAME); | 227 | strcpy(acpi_device_name(device), ACPI_AC_DEVICE_NAME); |
228 | strcpy(acpi_device_class(device), ACPI_AC_CLASS); | 228 | strcpy(acpi_device_class(device), ACPI_AC_CLASS); |
229 | acpi_driver_data(device) = ac; | 229 | acpi_driver_data(device) = ac; |