projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ACPI: ACPICA 20060421
[deliverable/linux.git]
/
drivers
/
acpi
/
executer
/
exutils.c
diff --git
a/drivers/acpi/executer/exutils.c
b/drivers/acpi/executer/exutils.c
index 1ee79d8c8f8827d2895ac6a221b592eea6c78cd0..3ef8cd703e06ed897a1968aae8c4380b2be51485 100644
(file)
--- a/
drivers/acpi/executer/exutils.c
+++ b/
drivers/acpi/executer/exutils.c
@@
-6,7
+6,7
@@
*****************************************************************************/
/*
*****************************************************************************/
/*
- * Copyright (C) 2000 - 200
5
, R. Byron Moore
+ * Copyright (C) 2000 - 200
6
, R. Byron Moore
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-87,11
+87,11
@@
acpi_status acpi_ex_enter_interpreter(void)
{
acpi_status status;
{
acpi_status status;
- ACPI_FUNCTION_TRACE(
"ex_enter_interpreter"
);
+ ACPI_FUNCTION_TRACE(
ex_enter_interpreter
);
status = acpi_ut_acquire_mutex(ACPI_MTX_EXECUTE);
if (ACPI_FAILURE(status)) {
status = acpi_ut_acquire_mutex(ACPI_MTX_EXECUTE);
if (ACPI_FAILURE(status)) {
- ACPI_
REPORT_ERROR(("Could not acquire interpreter mutex\n
"));
+ ACPI_
ERROR((AE_INFO, "Could not acquire interpreter mutex
"));
}
return_ACPI_STATUS(status);
}
return_ACPI_STATUS(status);
@@
-123,11
+123,11
@@
void acpi_ex_exit_interpreter(void)
{
acpi_status status;
{
acpi_status status;
- ACPI_FUNCTION_TRACE(
"ex_exit_interpreter"
);
+ ACPI_FUNCTION_TRACE(
ex_exit_interpreter
);
status = acpi_ut_release_mutex(ACPI_MTX_EXECUTE);
if (ACPI_FAILURE(status)) {
status = acpi_ut_release_mutex(ACPI_MTX_EXECUTE);
if (ACPI_FAILURE(status)) {
- ACPI_
REPORT_ERROR(("Could not release interpreter mutex\n
"));
+ ACPI_
ERROR((AE_INFO, "Could not release interpreter mutex
"));
}
return_VOID;
}
return_VOID;
@@
-189,24
+189,24
@@
u8 acpi_ex_acquire_global_lock(u32 field_flags)
u8 locked = FALSE;
acpi_status status;
u8 locked = FALSE;
acpi_status status;
- ACPI_FUNCTION_TRACE(
"ex_acquire_global_lock"
);
+ ACPI_FUNCTION_TRACE(
ex_acquire_global_lock
);
/* Only attempt lock if the always_lock bit is set */
if (field_flags & AML_FIELD_LOCK_RULE_MASK) {
/* Only attempt lock if the always_lock bit is set */
if (field_flags & AML_FIELD_LOCK_RULE_MASK) {
+
/* We should attempt to get the lock, wait forever */
status = acpi_ev_acquire_global_lock(ACPI_WAIT_FOREVER);
if (ACPI_SUCCESS(status)) {
locked = TRUE;
} else {
/* We should attempt to get the lock, wait forever */
status = acpi_ev_acquire_global_lock(ACPI_WAIT_FOREVER);
if (ACPI_SUCCESS(status)) {
locked = TRUE;
} else {
- ACPI_DEBUG_PRINT((ACPI_DB_ERROR,
- "Could not acquire Global Lock, %s\n",
- acpi_format_exception(status)));
+ ACPI_EXCEPTION((AE_INFO, status,
+ "Could not acquire Global Lock"));
}
}
}
}
- return_
VALUE
(locked);
+ return_
UINT8
(locked);
}
/*******************************************************************************
}
/*******************************************************************************
@@
-226,18
+226,21
@@
void acpi_ex_release_global_lock(u8 locked_by_me)
{
acpi_status status;
{
acpi_status status;
- ACPI_FUNCTION_TRACE(
"ex_release_global_lock"
);
+ ACPI_FUNCTION_TRACE(
ex_release_global_lock
);
/* Only attempt unlock if the caller locked it */
if (locked_by_me) {
/* Only attempt unlock if the caller locked it */
if (locked_by_me) {
+
/* OK, now release the lock */
status = acpi_ev_release_global_lock();
if (ACPI_FAILURE(status)) {
/* OK, now release the lock */
status = acpi_ev_release_global_lock();
if (ACPI_FAILURE(status)) {
+
/* Report the error, but there isn't much else we can do */
/* Report the error, but there isn't much else we can do */
- ACPI_REPORT_ERROR(("Could not release ACPI Global Lock, %s\n", acpi_format_exception(status)));
+ ACPI_EXCEPTION((AE_INFO, status,
+ "Could not release ACPI Global Lock"));
}
}
}
}
@@
-263,12
+266,12
@@
static u32 acpi_ex_digits_needed(acpi_integer value, u32 base)
u32 num_digits;
acpi_integer current_value;
u32 num_digits;
acpi_integer current_value;
- ACPI_FUNCTION_TRACE(
"ex_digits_needed"
);
+ ACPI_FUNCTION_TRACE(
ex_digits_needed
);
/* acpi_integer is unsigned, so we don't worry about a '-' prefix */
if (value == 0) {
/* acpi_integer is unsigned, so we don't worry about a '-' prefix */
if (value == 0) {
- return_
VALUE
(1);
+ return_
UINT32
(1);
}
current_value = value;
}
current_value = value;
@@
-282,7
+285,7
@@
static u32 acpi_ex_digits_needed(acpi_integer value, u32 base)
num_digits++;
}
num_digits++;
}
- return_
VALUE
(num_digits);
+ return_
UINT32
(num_digits);
}
/*******************************************************************************
}
/*******************************************************************************
This page took
0.029996 seconds
and
5
git commands to generate.