Fix s390 keyboard driver build break

PATCH In review Sachin Sant 2 participants 2 messages Aug 21, 2010

Subsystems (2)

Linux-next tree s390

lore

Share & tools

lore

Sachin Sant

author

2010-08-21 07:21 UTC #0 lore raw

PATCH 1/1 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]>

---

/drivers/s390/char/keyboard.c renamed from drivers/s390/char/keyboard.c +1 -1

diff -Naurp next20100820/drivers/s390/char/keyboard.c next20100820-new//drivers/s390/char/keyboard.c
@@ -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 == '-') {

Dmitry Torokhov

2010-08-21 07:40 UTC #1 lore raw

Hi Sachin,

Quoted 20 lines · Sachin Sant

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

/drivers/s390/char/keyboard.c kbd_keycode(struct kbd_data *kbd, unsign · line 311

Quoted 8 lines

/drivers/s390/char/keyboard.c renamed from drivers/s390/char/keyboard.c +1 -1

@@ -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.

Signature · 1 line

Dmitry