2010-08-21 07:21:34

by Sachin Sant

Subject: [-next PATCH] Fix s390 keyboard driver build break

Next 20100820 fails to build on s390 with

drivers/s390/char/keyboard.c: In function 'kbd_keycode':
drivers/s390/char/keyboard.c:308: error: too many arguments to function 'handle_sysrq'
make[2]: *** [drivers/s390/char/keyboard.o] Error 1

The following commit changed handle_sysrq() function to accept single argument.

commit a821bafce37b26499e2bfbf2e6b96b0636efc014
Input: sysrq - drop tty argument form handle_sysrq()

Adapt the code accordingly to fix the build break.

Signed-off-by: Sachin Sant <[email protected]>
---

diff -Naurp next20100820/drivers/s390/char/keyboard.c next20100820-new//drivers/s390/char/keyboard.c
--- next20100820/drivers/s390/char/keyboard.c 2010-08-16 06:11:37.000000000 +0530
+++ next20100820-new//drivers/s390/char/keyboard.c 2010-08-21 11:55:25.000000000 +0530
@@ -305,7 +305,7 @@ kbd_keycode(struct kbd_data *kbd, unsign
if (kbd->sysrq) {
if (kbd->sysrq == K(KT_LATIN, '-')) {
kbd->sysrq = 0;
- handle_sysrq(value, kbd->tty);
+ handle_sysrq(value);
return;
}
if (value == '-') {

2010-08-21 07:40:25

by Dmitry Torokhov

Subject: Re: [-next PATCH] Fix s390 keyboard driver build break

Hi Sachin,

On Sat, Aug 21, 2010 at 12:51:26PM +0530, Sachin Sant wrote:
> Next 20100820 fails to build on s390 with
>
> drivers/s390/char/keyboard.c: In function 'kbd_keycode':
> drivers/s390/char/keyboard.c:308: error: too many arguments to function 'handle_sysrq'
> make[2]: *** [drivers/s390/char/keyboard.o] Error 1
>
> The following commit changed handle_sysrq() function to accept single argument.
>
> commit a821bafce37b26499e2bfbf2e6b96b0636efc014
> Input: sysrq - drop tty argument form handle_sysrq()
>
> Adapt the code accordingly to fix the build break.
>
> Signed-off-by: Sachin Sant <[email protected]>
> ---
>
> diff -Naurp next20100820/drivers/s390/char/keyboard.c next20100820-new//drivers/s390/char/keyboard.c
> --- next20100820/drivers/s390/char/keyboard.c 2010-08-16 06:11:37.000000000 +0530
> +++ next20100820-new//drivers/s390/char/keyboard.c 2010-08-21 11:55:25.000000000 +0530
> @@ -305,7 +305,7 @@ kbd_keycode(struct kbd_data *kbd, unsign
> if (kbd->sysrq) {
> if (kbd->sysrq == K(KT_LATIN, '-')) {
> kbd->sysrq = 0;
> - handle_sysrq(value, kbd->tty);
> + handle_sysrq(value);
> return;
> }
> if (value == '-') {

Thank you very much for the patch. I folded it into original patch to
avoid build failures in case someone needs to bisect.

--
Dmitry