Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

hwmon: acpi_power_meter: Get rid of ACPICA message printing

Use acpi_evaluation_failure_warn() introduced previously instead of
the ACPICA-specific ACPI_EXCEPTION() macro to log warning messages
regarding ACPI object evaluation failures and use dev_err() instead
of ACPI_EXCEPTION() to log _PMC package parsing failures, which is
consistent with the other messages printed by the code in question.

Next, drop the ACPI_MODULE_NAME() definition only used by the ACPICA
message printing macro.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: Guenter Roeck <linux@roeck-us.net>

+19 -10
+19 -10
drivers/hwmon/acpi_power_meter.c
··· 20 20 #include <linux/acpi.h> 21 21 22 22 #define ACPI_POWER_METER_NAME "power_meter" 23 - ACPI_MODULE_NAME(ACPI_POWER_METER_NAME); 24 23 #define ACPI_POWER_METER_DEVICE_NAME "Power Meter" 25 24 #define ACPI_POWER_METER_CLASS "pwr_meter_resource" 26 25 ··· 113 114 status = acpi_evaluate_integer(resource->acpi_dev->handle, "_GAI", 114 115 NULL, &data); 115 116 if (ACPI_FAILURE(status)) { 116 - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _GAI")); 117 + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_GAI", 118 + status); 117 119 return -ENODEV; 118 120 } 119 121 ··· 166 166 mutex_unlock(&resource->lock); 167 167 168 168 if (ACPI_FAILURE(status)) { 169 - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PAI")); 169 + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_PAI", 170 + status); 170 171 return -EINVAL; 171 172 } 172 173 ··· 187 186 status = acpi_evaluate_integer(resource->acpi_dev->handle, "_GHL", 188 187 NULL, &data); 189 188 if (ACPI_FAILURE(status)) { 190 - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _GHL")); 189 + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_GHL", 190 + status); 191 191 return -ENODEV; 192 192 } 193 193 ··· 239 237 mutex_unlock(&resource->lock); 240 238 241 239 if (ACPI_FAILURE(status)) { 242 - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _SHL")); 240 + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_SHL", 241 + status); 243 242 return -EINVAL; 244 243 } 245 244 ··· 273 270 status = acpi_evaluate_integer(resource->acpi_dev->handle, "_PTP", 274 271 &args, &data); 275 272 if (ACPI_FAILURE(status)) { 276 - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PTP")); 273 + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_PTP", 274 + status); 277 275 return -EINVAL; 278 276 } 279 277 ··· 326 322 status = acpi_evaluate_integer(resource->acpi_dev->handle, "_PMM", 327 323 NULL, &data); 328 324 if (ACPI_FAILURE(status)) { 329 - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PMM")); 325 + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_PMM", 326 + status); 330 327 return -ENODEV; 331 328 } 332 329 ··· 554 549 status = acpi_evaluate_object(resource->acpi_dev->handle, "_PMD", NULL, 555 550 &buffer); 556 551 if (ACPI_FAILURE(status)) { 557 - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PMD")); 552 + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_PMD", 553 + status); 558 554 return -ENODEV; 559 555 } 560 556 ··· 751 745 status = acpi_evaluate_object(resource->acpi_dev->handle, "_PMC", NULL, 752 746 &buffer); 753 747 if (ACPI_FAILURE(status)) { 754 - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PMC")); 748 + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_PMC", 749 + status); 755 750 return -ENODEV; 756 751 } 757 752 ··· 772 765 773 766 status = acpi_extract_package(pss, &format, &state); 774 767 if (ACPI_FAILURE(status)) { 775 - ACPI_EXCEPTION((AE_INFO, status, "Invalid data")); 768 + dev_err(&resource->acpi_dev->dev, ACPI_POWER_METER_NAME 769 + "_PMC package parsing failed: %s\n", 770 + acpi_format_exception(status)); 776 771 res = -EFAULT; 777 772 goto end; 778 773 }