2021-01-23 21:51:32

by Emil Renner Berthing

Subject: [PATCH] vt: keyboard, use new API for keyboard_tasklet

This converts the keyboard_tasklet to use the new API in
commit 12cc923f1ccc ("tasklet: Introduce new initialization API")

The new API changes the argument passed to the callback function, but
fortunately the argument isn't used so it is straight forward to use
DECLARE_TASKLET_DISABLED() rather than DECLARE_TASKLET_DISABLED_OLD().

Signed-off-by: Emil Renner Berthing <[email protected]>
---
drivers/tty/vt/keyboard.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
index 52922d21a49f..6c85f024bec4 100644
--- a/drivers/tty/vt/keyboard.c
+++ b/drivers/tty/vt/keyboard.c
@@ -1233,7 +1233,7 @@ void vt_kbd_con_stop(int console)
* handle the scenario when keyboard handler is not registered yet
* but we already getting updates from the VT to update led state.
*/
-static void kbd_bh(unsigned long dummy)
+static void kbd_bh(struct tasklet_struct *unused)
{
unsigned int leds;
unsigned long flags;
@@ -1249,7 +1249,7 @@ static void kbd_bh(unsigned long dummy)
}
}

-DECLARE_TASKLET_DISABLED_OLD(keyboard_tasklet, kbd_bh);
+DECLARE_TASKLET_DISABLED(keyboard_tasklet, kbd_bh);

#if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) ||\
defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) ||\
--
2.30.0

2021-01-28 00:00:10

by Greg Kroah-Hartman

Subject: Re: [PATCH] vt: keyboard, use new API for keyboard_tasklet

On Sat, Jan 23, 2021 at 10:47:39PM +0100, Emil Renner Berthing wrote:
> This converts the keyboard_tasklet to use the new API in
> commit 12cc923f1ccc ("tasklet: Introduce new initialization API")
>
> The new API changes the argument passed to the callback function, but
> fortunately the argument isn't used so it is straight forward to use
> DECLARE_TASKLET_DISABLED() rather than DECLARE_TASKLET_DISABLED_OLD().
>
> Signed-off-by: Emil Renner Berthing <[email protected]>
> ---
> drivers/tty/vt/keyboard.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Does not apply to my tty-next branch of my tty.git tree :(

Please rebase and resend.

thanks,

greg k-h