Skip to content

Commit

Permalink
ACPI: battery: add struct acpi_device to struct acpi_battery.
Browse files Browse the repository at this point in the history
- Use it instead of acpi_bus_get_device()..

Signed-off-by: Patrick Mochel <mochel@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
  • Loading branch information
Patrick Mochel authored and Len Brown committed Jun 30, 2006
1 parent 3b74863 commit 145def8
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions drivers/acpi/battery.c
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ struct acpi_battery_trips {

struct acpi_battery {
acpi_handle handle;
struct acpi_device * device;
struct acpi_battery_flags flags;
struct acpi_battery_trips trips;
unsigned long alarm;
Expand Down Expand Up @@ -278,9 +279,7 @@ static int acpi_battery_check(struct acpi_battery *battery)
if (!battery)
return -EINVAL;

result = acpi_bus_get_device(battery->handle, &device);
if (result)
return result;
device = battery->device;

result = acpi_bus_get_status(device);
if (result)
Expand Down Expand Up @@ -662,8 +661,7 @@ static void acpi_battery_notify(acpi_handle handle, u32 event, void *data)
if (!battery)
return;

if (acpi_bus_get_device(handle, &device))
return;
device = battery->device;

switch (event) {
case ACPI_BATTERY_NOTIFY_STATUS:
Expand Down Expand Up @@ -696,6 +694,7 @@ static int acpi_battery_add(struct acpi_device *device)
memset(battery, 0, sizeof(struct acpi_battery));

battery->handle = device->handle;
battery->device = device;
strcpy(acpi_device_name(device), ACPI_BATTERY_DEVICE_NAME);
strcpy(acpi_device_class(device), ACPI_BATTERY_CLASS);
acpi_driver_data(device) = battery;
Expand Down

0 comments on commit 145def8

Please sign in to comment.