drivers/platform/x86/lenovo/thinkpad_acpi.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
Remove an unneeded goto statement in hotkey_kthread(). Since
the function has a single exit location with no cleanup code,
the jump provides no benefit. Per the kernel coding style,
returning directly is preferred over goto in such case [1].
[1] https://www.kernel.org/doc/html/latest/process/coding-style.html
Signed-off-by: Eduardo Vasconcelos <eduardo@eduardovasconcelos.com>
Tested-by: Eduardo Vasconcelos <eduardo@eduardovasconcelos.com> (T420si)
---
drivers/platform/x86/lenovo/thinkpad_acpi.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/drivers/platform/x86/lenovo/thinkpad_acpi.c b/drivers/platform/x86/lenovo/thinkpad_acpi.c
index e1cee42a1683..d4ed6f1216f2 100644
--- a/drivers/platform/x86/lenovo/thinkpad_acpi.c
+++ b/drivers/platform/x86/lenovo/thinkpad_acpi.c
@@ -2469,7 +2469,7 @@ static int hotkey_kthread(void *data)
bool was_frozen;
if (tpacpi_lifecycle == TPACPI_LIFE_EXITING)
- goto exit;
+ return 0;
set_freezable();
@@ -2526,7 +2526,6 @@ static int hotkey_kthread(void *data)
si ^= 1;
}
-exit:
return 0;
}
--
2.54.0
On Sat, 25 Apr 2026 03:39:34 -0300, Eduardo Vasconcelos wrote:
> Remove an unneeded goto statement in hotkey_kthread(). Since
> the function has a single exit location with no cleanup code,
> the jump provides no benefit. Per the kernel coding style,
> returning directly is preferred over goto in such case [1].
>
> [1] https://www.kernel.org/doc/html/latest/process/coding-style.html
>
> [...]
Thank you for your contribution, it has been applied to my local
review-ilpo-next branch. Note it will show up in the public
platform-drivers-x86/review-ilpo-next branch only once I've pushed my
local branch there, which might take a while.
The list of commits applied:
[1/1] platform/x86: thinkpad_acpi: Remove unneeded goto
commit: 74ab7c4d73d526bfebc6f3fd7382c6f672d8b912
--
i.
On Sat, Apr 25, 2026, at 2:39 AM, Eduardo Vasconcelos wrote: > Remove an unneeded goto statement in hotkey_kthread(). Since > the function has a single exit location with no cleanup code, > the jump provides no benefit. Per the kernel coding style, > returning directly is preferred over goto in such case [1]. > > [1] https://www.kernel.org/doc/html/latest/process/coding-style.html > > Signed-off-by: Eduardo Vasconcelos <eduardo@eduardovasconcelos.com> > Tested-by: Eduardo Vasconcelos <eduardo@eduardovasconcelos.com> (T420si) > --- > drivers/platform/x86/lenovo/thinkpad_acpi.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/platform/x86/lenovo/thinkpad_acpi.c > b/drivers/platform/x86/lenovo/thinkpad_acpi.c > index e1cee42a1683..d4ed6f1216f2 100644 > --- a/drivers/platform/x86/lenovo/thinkpad_acpi.c > +++ b/drivers/platform/x86/lenovo/thinkpad_acpi.c > @@ -2469,7 +2469,7 @@ static int hotkey_kthread(void *data) > bool was_frozen; > > if (tpacpi_lifecycle == TPACPI_LIFE_EXITING) > - goto exit; > + return 0; > > set_freezable(); > > @@ -2526,7 +2526,6 @@ static int hotkey_kthread(void *data) > si ^= 1; > } > > -exit: > return 0; > } > > -- > 2.54.0 Looks good to me. Thanks! Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>
© 2016 - 2026 Red Hat, Inc.