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 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
acpi
/
acpica
/
hwgpe.c
diff --git
a/drivers/acpi/acpica/hwgpe.c
b/drivers/acpi/acpica/hwgpe.c
index
d3b7e37
..
c28c41b
100644
(file)
--- a/
drivers/acpi/acpica/hwgpe.c
+++ b/
drivers/acpi/acpica/hwgpe.c
@@
-82,7
+82,7
@@
acpi_status acpi_hw_low_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)
/* Get current value of the enable register that contains this GPE */
/* Get current value of the enable register that contains this GPE */
- status = acpi_read(&enable_mask, &gpe_register_info->enable_address);
+ status = acpi_
hw_
read(&enable_mask, &gpe_register_info->enable_address);
if (ACPI_FAILURE(status)) {
return (status);
}
if (ACPI_FAILURE(status)) {
return (status);
}
@@
-95,7
+95,7
@@
acpi_status acpi_hw_low_disable_gpe(struct acpi_gpe_event_info *gpe_event_info)
/* Write the updated enable mask */
/* Write the updated enable mask */
- status = acpi_write(enable_mask, &gpe_register_info->enable_address);
+ status = acpi_
hw_
write(enable_mask, &gpe_register_info->enable_address);
return (status);
}
return (status);
}
@@
-130,8
+130,8
@@
acpi_hw_write_gpe_enable_reg(struct acpi_gpe_event_info * gpe_event_info)
/* Write the entire GPE (runtime) enable register */
/* Write the entire GPE (runtime) enable register */
- status = acpi_write(gpe_register_info->enable_for_run,
- &gpe_register_info->enable_address);
+ status = acpi_
hw_
write(gpe_register_info->enable_for_run,
+
&gpe_register_info->enable_address);
return (status);
}
return (status);
}
@@
-163,8
+163,8
@@
acpi_status acpi_hw_clear_gpe(struct acpi_gpe_event_info * gpe_event_info)
* Write a one to the appropriate bit in the status register to
* clear this GPE.
*/
* Write a one to the appropriate bit in the status register to
* clear this GPE.
*/
- status = acpi_write(register_bit,
- &gpe_event_info->register_info->status_address);
+ status = acpi_
hw_
write(register_bit,
+
&gpe_event_info->register_info->status_address);
return (status);
}
return (status);
}
@@
-222,7
+222,7
@@
acpi_hw_get_gpe_status(struct acpi_gpe_event_info * gpe_event_info,
/* GPE currently active (status bit == 1)? */
/* GPE currently active (status bit == 1)? */
- status = acpi_read(&in_byte, &gpe_register_info->status_address);
+ status = acpi_
hw_
read(&in_byte, &gpe_register_info->status_address);
if (ACPI_FAILURE(status)) {
goto unlock_and_exit;
}
if (ACPI_FAILURE(status)) {
goto unlock_and_exit;
}
@@
-266,8
+266,8
@@
acpi_hw_disable_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
/* Disable all GPEs in this register */
status =
/* Disable all GPEs in this register */
status =
- acpi_write(0x00,
- &gpe_block->register_info[i].enable_address);
+ acpi_
hw_
write(0x00,
+
&gpe_block->register_info[i].enable_address);
if (ACPI_FAILURE(status)) {
return (status);
}
if (ACPI_FAILURE(status)) {
return (status);
}
@@
-303,8
+303,8
@@
acpi_hw_clear_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
/* Clear status on all GPEs in this register */
status =
/* Clear status on all GPEs in this register */
status =
- acpi_write(0xFF,
- &gpe_block->register_info[i].status_address);
+ acpi_
hw_
write(0xFF,
+
&gpe_block->register_info[i].status_address);
if (ACPI_FAILURE(status)) {
return (status);
}
if (ACPI_FAILURE(status)) {
return (status);
}
@@
-345,9
+345,9
@@
acpi_hw_enable_runtime_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
/* Enable all "runtime" GPEs in this register */
/* Enable all "runtime" GPEs in this register */
- status =
acpi_write(gpe_block->register_info[i].enable_for_run,
- &gpe_block->register_info[i].
-
enable_address);
+ status =
+ acpi_hw_write(gpe_block->register_info[i].enable_for_run,
+
&gpe_block->register_info[i].
enable_address);
if (ACPI_FAILURE(status)) {
return (status);
}
if (ACPI_FAILURE(status)) {
return (status);
}
@@
-387,9
+387,9
@@
acpi_hw_enable_wakeup_gpe_block(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
/* Enable all "wake" GPEs in this register */
/* Enable all "wake" GPEs in this register */
- status =
acpi_write(gpe_block->register_info[i].enable_for_wake,
- &gpe_block->register_info[i].
-
enable_address);
+ status =
+ acpi_hw_write(gpe_block->register_info[i].enable_for_wake,
+
&gpe_block->register_info[i].
enable_address);
if (ACPI_FAILURE(status)) {
return (status);
}
if (ACPI_FAILURE(status)) {
return (status);
}