git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/mfasheh...
[pandora-kernel.git]
/
drivers
/
acpi
/
power.c
diff --git
a/drivers/acpi/power.c
b/drivers/acpi/power.c
index
fec225d
..
0ba7dfb
100644
(file)
--- a/
drivers/acpi/power.c
+++ b/
drivers/acpi/power.c
@@
-108,7
+108,7
@@
acpi_power_get_context(acpi_handle handle,
return result;
}
return result;
}
- *resource =
(struct acpi_power_resource *)
acpi_driver_data(device);
+ *resource = acpi_driver_data(device);
if (!resource)
return -ENODEV;
if (!resource)
return -ENODEV;
@@
-216,10
+216,8
@@
static int acpi_power_off_device(acpi_handle handle)
{
int result = 0;
acpi_status status = AE_OK;
{
int result = 0;
acpi_status status = AE_OK;
- struct acpi_device *device = NULL;
struct acpi_power_resource *resource = NULL;
struct acpi_power_resource *resource = NULL;
-
result = acpi_power_get_context(handle, &resource);
if (result)
return result;
result = acpi_power_get_context(handle, &resource);
if (result)
return result;
@@
-230,13
+228,13
@@
static int acpi_power_off_device(acpi_handle handle)
if (resource->references) {
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Resource [%s] is still in use, dereferencing\n",
if (resource->references) {
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Resource [%s] is still in use, dereferencing\n",
- device->pnp.bus_id));
+
resource->
device->pnp.bus_id));
return 0;
}
if (resource->state == ACPI_POWER_RESOURCE_STATE_OFF) {
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] already off\n",
return 0;
}
if (resource->state == ACPI_POWER_RESOURCE_STATE_OFF) {
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] already off\n",
- device->pnp.bus_id));
+
resource->
device->pnp.bus_id));
return 0;
}
return 0;
}
@@
-251,8
+249,7
@@
static int acpi_power_off_device(acpi_handle handle)
return -ENOEXEC;
/* Update the power resource's _device_ power state */
return -ENOEXEC;
/* Update the power resource's _device_ power state */
- device = resource->device;
- device->power.state = ACPI_STATE_D3;
+ resource->device->power.state = ACPI_STATE_D3;
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] turned off\n",
resource->name));
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Resource [%s] turned off\n",
resource->name));
@@
-445,7
+442,7
@@
static int acpi_power_seq_show(struct seq_file *seq, void *offset)
struct acpi_power_resource *resource = NULL;
struct acpi_power_resource *resource = NULL;
- resource =
(struct acpi_power_resource *)
seq->private;
+ resource = seq->private;
if (!resource)
goto end;
if (!resource)
goto end;
@@
-535,10
+532,9
@@
static int acpi_power_add(struct acpi_device *device)
if (!device)
return -EINVAL;
if (!device)
return -EINVAL;
- resource = k
m
alloc(sizeof(struct acpi_power_resource), GFP_KERNEL);
+ resource = k
z
alloc(sizeof(struct acpi_power_resource), GFP_KERNEL);
if (!resource)
return -ENOMEM;
if (!resource)
return -ENOMEM;
- memset(resource, 0, sizeof(struct acpi_power_resource));
resource->device = device;
strcpy(resource->name, device->pnp.bus_id);
resource->device = device;
strcpy(resource->name, device->pnp.bus_id);
@@
-593,7
+589,7
@@
static int acpi_power_remove(struct acpi_device *device, int type)
if (!device || !acpi_driver_data(device))
return -EINVAL;
if (!device || !acpi_driver_data(device))
return -EINVAL;
- resource =
(struct acpi_power_resource *)
acpi_driver_data(device);
+ resource = acpi_driver_data(device);
acpi_power_remove_fs(device);
acpi_power_remove_fs(device);