acpi: sparse fix, replace macro with static function
PATCH 1/1 acpi: sparse fix, replace macro with static function
replace acpi_util_eval_error macro with static function.
Avoid these sparse warnings due to using buffer within the macro. drivers/acpi/utils.c:273:3: warning: symbol 'buffer' shadows an earlier one drivers/acpi/utils.c:259:21: originally declared here drivers/acpi/utils.c:279:3: warning: symbol 'buffer' shadows an earlier one drivers/acpi/utils.c:259:21: originally declared here drivers/acpi/utils.c:368:3: warning: symbol 'buffer' shadows an earlier one drivers/acpi/utils.c:348:21: originally declared here drivers/acpi/utils.c:375:3: warning: symbol 'buffer' shadows an earlier one drivers/acpi/utils.c:348:21: originally declared here drivers/acpi/utils.c:382:3: warning: symbol 'buffer' shadows an earlier one drivers/acpi/utils.c:348:21: originally declared here drivers/acpi/utils.c:402:4: warning: symbol 'buffer' shadows an earlier one drivers/acpi/utils.c:348:21: originally declared here
--- drivers/acpi/utils.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-)
drivers/acpi/utils.c +11 -7
@@ -36,16 +36,20 @@ ACPI_MODULE_NAME("utils");/* -------------------------------------------------------------------------- Object Evaluation Helpers -------------------------------------------------------------------------- */ +static void +acpi_util_eval_error (acpi_handle h,acpi_string p,acpi_status s) +{#ifdef ACPI_DEBUG_OUTPUT -#define acpi_util_eval_error (h,p,s) {\ - char prefix[80] = {'\0'};\ - struct acpi_buffer buffer = {sizeof(prefix), prefix};\ - acpi_get_name(h, ACPI_FULL_PATHNAME, &buffer);\ - ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Evaluate [%s.%s]: %s\n",\ - (char *) prefix, p, acpi_format_exception(s))); } +char prefix[80 ] = {'\0' }; +struct acpi_buffer buffer = {sizeof (prefix), prefix}; +acpi_get_name (h,ACPI_FULL_PATHNAME , &buffer); +ACPI_DEBUG_PRINT ((ACPI_DB_INFO ,"Evaluate [%s.%s]: %s\n" , + (char *) prefix, p,acpi_format_exception (s)));#else -#define acpi_util_eval_error (h,p,s) +return ;#endif +} +acpi_status acpi_extract_package (union acpi_object *package,struct acpi_buffer *format,struct acpi_buffer *buffer)
Signature · 1 line
1.5.4.1.1278.gc75be