| Message ID | 1890478.AxU35vj7Mz@kreacher |
|---|---|
| State | New |
| Headers | show |
| Series | ACPI: New helper for warning messages and replacing ACPI_EXCEPTION() | expand |
On Fri, Mar 05, 2021 at 07:43:54PM +0100, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > 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> > --- > drivers/hwmon/acpi_power_meter.c | 29 +++++++++++++++++++---------- > 1 file changed, 19 insertions(+), 10 deletions(-) > > Index: linux-pm/drivers/hwmon/acpi_power_meter.c > =================================================================== > --- linux-pm.orig/drivers/hwmon/acpi_power_meter.c > +++ linux-pm/drivers/hwmon/acpi_power_meter.c > @@ -20,7 +20,6 @@ > #include <linux/acpi.h> > > #define ACPI_POWER_METER_NAME "power_meter" > -ACPI_MODULE_NAME(ACPI_POWER_METER_NAME); > #define ACPI_POWER_METER_DEVICE_NAME "Power Meter" > #define ACPI_POWER_METER_CLASS "pwr_meter_resource" > > @@ -114,7 +113,8 @@ static int update_avg_interval(struct ac > status = acpi_evaluate_integer(resource->acpi_dev->handle, "_GAI", > NULL, &data); > if (ACPI_FAILURE(status)) { > - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _GAI")); > + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_GAI", > + status); > return -ENODEV; > } > > @@ -166,7 +166,8 @@ static ssize_t set_avg_interval(struct d > mutex_unlock(&resource->lock); > > if (ACPI_FAILURE(status)) { > - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PAI")); > + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_PAI", > + status); > return -EINVAL; > } > > @@ -186,7 +187,8 @@ static int update_cap(struct acpi_power_ > status = acpi_evaluate_integer(resource->acpi_dev->handle, "_GHL", > NULL, &data); > if (ACPI_FAILURE(status)) { > - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _GHL")); > + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_GHL", > + status); > return -ENODEV; > } > > @@ -237,7 +239,8 @@ static ssize_t set_cap(struct device *de > mutex_unlock(&resource->lock); > > if (ACPI_FAILURE(status)) { > - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _SHL")); > + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_SHL", > + status); > return -EINVAL; > } > > @@ -270,7 +273,8 @@ static int set_acpi_trip(struct acpi_pow > status = acpi_evaluate_integer(resource->acpi_dev->handle, "_PTP", > &args, &data); > if (ACPI_FAILURE(status)) { > - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PTP")); > + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_PTP", > + status); > return -EINVAL; > } > > @@ -322,7 +326,8 @@ static int update_meter(struct acpi_powe > status = acpi_evaluate_integer(resource->acpi_dev->handle, "_PMM", > NULL, &data); > if (ACPI_FAILURE(status)) { > - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PMM")); > + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_PMM", > + status); > return -ENODEV; > } > > @@ -549,7 +554,8 @@ static int read_domain_devices(struct ac > status = acpi_evaluate_object(resource->acpi_dev->handle, "_PMD", NULL, > &buffer); > if (ACPI_FAILURE(status)) { > - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PMD")); > + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_PMD", > + status); > return -ENODEV; > } > > @@ -745,7 +751,8 @@ static int read_capabilities(struct acpi > status = acpi_evaluate_object(resource->acpi_dev->handle, "_PMC", NULL, > &buffer); > if (ACPI_FAILURE(status)) { > - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PMC")); > + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_PMC", > + status); > return -ENODEV; > } > > @@ -765,7 +772,9 @@ static int read_capabilities(struct acpi > > status = acpi_extract_package(pss, &format, &state); > if (ACPI_FAILURE(status)) { > - ACPI_EXCEPTION((AE_INFO, status, "Invalid data")); > + dev_err(&resource->acpi_dev->dev, ACPI_POWER_METER_NAME > + "_PMC package parsing failed: %s\n", > + acpi_format_exception(status)); > res = -EFAULT; > goto end; > } > > >
Index: linux-pm/drivers/hwmon/acpi_power_meter.c =================================================================== --- linux-pm.orig/drivers/hwmon/acpi_power_meter.c +++ linux-pm/drivers/hwmon/acpi_power_meter.c @@ -20,7 +20,6 @@ #include <linux/acpi.h> #define ACPI_POWER_METER_NAME "power_meter" -ACPI_MODULE_NAME(ACPI_POWER_METER_NAME); #define ACPI_POWER_METER_DEVICE_NAME "Power Meter" #define ACPI_POWER_METER_CLASS "pwr_meter_resource" @@ -114,7 +113,8 @@ static int update_avg_interval(struct ac status = acpi_evaluate_integer(resource->acpi_dev->handle, "_GAI", NULL, &data); if (ACPI_FAILURE(status)) { - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _GAI")); + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_GAI", + status); return -ENODEV; } @@ -166,7 +166,8 @@ static ssize_t set_avg_interval(struct d mutex_unlock(&resource->lock); if (ACPI_FAILURE(status)) { - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PAI")); + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_PAI", + status); return -EINVAL; } @@ -186,7 +187,8 @@ static int update_cap(struct acpi_power_ status = acpi_evaluate_integer(resource->acpi_dev->handle, "_GHL", NULL, &data); if (ACPI_FAILURE(status)) { - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _GHL")); + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_GHL", + status); return -ENODEV; } @@ -237,7 +239,8 @@ static ssize_t set_cap(struct device *de mutex_unlock(&resource->lock); if (ACPI_FAILURE(status)) { - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _SHL")); + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_SHL", + status); return -EINVAL; } @@ -270,7 +273,8 @@ static int set_acpi_trip(struct acpi_pow status = acpi_evaluate_integer(resource->acpi_dev->handle, "_PTP", &args, &data); if (ACPI_FAILURE(status)) { - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PTP")); + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_PTP", + status); return -EINVAL; } @@ -322,7 +326,8 @@ static int update_meter(struct acpi_powe status = acpi_evaluate_integer(resource->acpi_dev->handle, "_PMM", NULL, &data); if (ACPI_FAILURE(status)) { - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PMM")); + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_PMM", + status); return -ENODEV; } @@ -549,7 +554,8 @@ static int read_domain_devices(struct ac status = acpi_evaluate_object(resource->acpi_dev->handle, "_PMD", NULL, &buffer); if (ACPI_FAILURE(status)) { - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PMD")); + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_PMD", + status); return -ENODEV; } @@ -745,7 +751,8 @@ static int read_capabilities(struct acpi status = acpi_evaluate_object(resource->acpi_dev->handle, "_PMC", NULL, &buffer); if (ACPI_FAILURE(status)) { - ACPI_EXCEPTION((AE_INFO, status, "Evaluating _PMC")); + acpi_evaluation_failure_warn(resource->acpi_dev->handle, "_PMC", + status); return -ENODEV; } @@ -765,7 +772,9 @@ static int read_capabilities(struct acpi status = acpi_extract_package(pss, &format, &state); if (ACPI_FAILURE(status)) { - ACPI_EXCEPTION((AE_INFO, status, "Invalid data")); + dev_err(&resource->acpi_dev->dev, ACPI_POWER_METER_NAME + "_PMC package parsing failed: %s\n", + acpi_format_exception(status)); res = -EFAULT; goto end; }