Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 230901
b: refs/heads/master
c: f6767dc
h: refs/heads/master
i:
  230899: 2bb0a8f
v: v3
  • Loading branch information
Rafael J. Wysocki authored and Len Brown committed Jan 12, 2011
1 parent 0b177f3 commit 3933823
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 21 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 40b7397579e006c0f9cf4de58e9ccc350e06308f
refs/heads/master: f6767dcf2a4f6e62960912d0affec1e15a246191
19 changes: 0 additions & 19 deletions trunk/drivers/acpi/bus.c
Original file line number Diff line number Diff line change
Expand Up @@ -236,25 +236,6 @@ static int __acpi_bus_get_power(struct acpi_device *device, int *state)
}


int acpi_bus_get_power(acpi_handle handle, int *state)
{
struct acpi_device *device;
int result;

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

result = __acpi_bus_get_power(device, state);
if (result)
return result;

device->power.state = *state;
return 0;
}
EXPORT_SYMBOL(acpi_bus_get_power);


static int __acpi_bus_set_power(struct acpi_device *device, int state)
{
int result = 0;
Expand Down
1 change: 0 additions & 1 deletion trunk/include/acpi/acpi_bus.h
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,6 @@ void acpi_bus_data_handler(acpi_handle handle, void *context);
acpi_status acpi_bus_get_status_handle(acpi_handle handle,
unsigned long long *sta);
int acpi_bus_get_status(struct acpi_device *device);
int acpi_bus_get_power(acpi_handle handle, int *state);
int acpi_bus_set_power(acpi_handle handle, int state);
int acpi_bus_update_power(acpi_handle handle, int *state_p);
bool acpi_bus_power_manageable(acpi_handle handle);
Expand Down

0 comments on commit 3933823

Please sign in to comment.