| Message ID | 20210609175130.224274-1-hdegoede@redhat.com |
|---|---|
| State | Accepted |
| Commit | f39de44fbb478ed476f001ca505b2b58d3345a30 |
| Headers | show |
| Series | ACPI: Remove redundant clearing of context->ret.pointer from acpi_run_osc() | expand |
On Thu, Jun 10, 2021 at 9:01 AM Mika Westerberg <mika.westerberg@linux.intel.com> wrote: > > On Wed, Jun 09, 2021 at 07:51:30PM +0200, Hans de Goede wrote: > > context->ret.pointer already gets set to NULL at the beginning of > > acpi_run_osc() and it only gets assigned a new value in the success > > path near the end of acpi_run_osc(), so the clearing of > > context->ret.pointer (when status != AE_OK) at the end of > > acpi_run_osc() is redundant since it will always already be NULL when > > status != AE_OK. > > > > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > > Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Applied as 5.14 material, thanks!
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index a4bd673934c0..ab41185cd2a8 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -262,8 +262,6 @@ acpi_status acpi_run_osc(acpi_handle handle, struct acpi_osc_context *context) out_kfree: kfree(output.pointer); - if (status != AE_OK) - context->ret.pointer = NULL; return status; } EXPORT_SYMBOL(acpi_run_osc);
context->ret.pointer already gets set to NULL at the beginning of acpi_run_osc() and it only gets assigned a new value in the success path near the end of acpi_run_osc(), so the clearing of context->ret.pointer (when status != AE_OK) at the end of acpi_run_osc() is redundant since it will always already be NULL when status != AE_OK. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/acpi/bus.c | 2 -- 1 file changed, 2 deletions(-)