From 54074ff8b2aa2110201beb428e08282167978b40 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Thu, 11 May 2006 00:28:12 -0400 Subject: [PATCH] --- yaml --- r: 29167 b: refs/heads/master c: 9011bff4bdc0fef1f9a782d7415c306ee61826c9 h: refs/heads/master i: 29165: f7f735c4f37c9b418bb28c0333ab7475bd80a40e 29163: 3b40b7a5b4babe8b0e7bd2b7d943cc13807df281 29159: 43621201029fffc5742cc2ad642b3d2797ce8c63 29151: c94be8afed555f2bd6e494b51a28d34a861545e3 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/processor_perflib.c | 10 +++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 40d7a902dce6..7141e537edeb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e1f19e50371e1d148226b64c8edc77fec47fa5b +refs/heads/master: 9011bff4bdc0fef1f9a782d7415c306ee61826c9 diff --git a/trunk/drivers/acpi/processor_perflib.c b/trunk/drivers/acpi/processor_perflib.c index ffc5280334c8..431a8450346b 100644 --- a/trunk/drivers/acpi/processor_perflib.c +++ b/trunk/drivers/acpi/processor_perflib.c @@ -563,11 +563,9 @@ static int acpi_processor_get_psd(struct acpi_processor *pr) union acpi_object *psd = NULL; struct acpi_psd_package *pdomain; - ACPI_FUNCTION_TRACE("acpi_processor_get_psd"); - status = acpi_evaluate_object(pr->handle, "_PSD", NULL, &buffer); if (ACPI_FAILURE(status)) { - return_VALUE(-ENODEV); + return -ENODEV; } psd = (union acpi_object *) buffer.pointer; @@ -610,7 +608,7 @@ static int acpi_processor_get_psd(struct acpi_processor *pr) end: acpi_os_free(buffer.pointer); - return_VALUE(result); + return result; } int acpi_processor_preregister_performance( @@ -625,8 +623,6 @@ int acpi_processor_preregister_performance( struct acpi_processor *match_pr; struct acpi_psd_package *match_pdomain; - ACPI_FUNCTION_TRACE("acpi_processor_preregister_performance"); - down(&performance_sem); retval = 0; @@ -776,7 +772,7 @@ int acpi_processor_preregister_performance( } up(&performance_sem); - return_VALUE(retval); + return retval; } EXPORT_SYMBOL(acpi_processor_preregister_performance);