projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[linux-drm-fsl-dcu.git]
/
drivers
/
acpi
/
parser
/
psscope.c
diff --git
a/drivers/acpi/parser/psscope.c
b/drivers/acpi/parser/psscope.c
index 424ab1c20da52d9a923dc66030ab267c37bf2f37..77cfa4ed0cfeccfcc94e187fc0726a96e3df7006 100644
(file)
--- a/
drivers/acpi/parser/psscope.c
+++ b/
drivers/acpi/parser/psscope.c
@@
-5,7
+5,7
@@
*****************************************************************************/
/*
*****************************************************************************/
/*
- * Copyright (C) 2000 - 200
6
, R. Byron Moore
+ * Copyright (C) 2000 - 200
7
, 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
@@
-106,7
+106,7
@@
acpi_ps_init_scope(struct acpi_parse_state * parser_state,
{
union acpi_generic_state *scope;
{
union acpi_generic_state *scope;
- ACPI_FUNCTION_TRACE_PTR(
"ps_init_scope"
, root_op);
+ ACPI_FUNCTION_TRACE_PTR(
ps_init_scope
, root_op);
scope = acpi_ut_create_generic_state();
if (!scope) {
scope = acpi_ut_create_generic_state();
if (!scope) {
@@
-147,7
+147,7
@@
acpi_ps_push_scope(struct acpi_parse_state *parser_state,
{
union acpi_generic_state *scope;
{
union acpi_generic_state *scope;
- ACPI_FUNCTION_TRACE_PTR(
"ps_push_scope"
, op);
+ ACPI_FUNCTION_TRACE_PTR(
ps_push_scope
, op);
scope = acpi_ut_create_generic_state();
if (!scope) {
scope = acpi_ut_create_generic_state();
if (!scope) {
@@
-200,7
+200,7
@@
acpi_ps_pop_scope(struct acpi_parse_state *parser_state,
{
union acpi_generic_state *scope = parser_state->scope;
{
union acpi_generic_state *scope = parser_state->scope;
- ACPI_FUNCTION_TRACE(
"ps_pop_scope"
);
+ ACPI_FUNCTION_TRACE(
ps_pop_scope
);
/* Only pop the scope if there is in fact a next scope */
/* Only pop the scope if there is in fact a next scope */
@@
-247,7
+247,7
@@
void acpi_ps_cleanup_scope(struct acpi_parse_state *parser_state)
{
union acpi_generic_state *scope;
{
union acpi_generic_state *scope;
- ACPI_FUNCTION_TRACE_PTR(
"ps_cleanup_scope"
, parser_state);
+ ACPI_FUNCTION_TRACE_PTR(
ps_cleanup_scope
, parser_state);
if (!parser_state) {
return_VOID;
if (!parser_state) {
return_VOID;