Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[firefly-linux-kernel-4.4.55.git] / drivers / s390 / char / ctrlchar.c

diff --git a/drivers/s390/char/ctrlchar.c b/drivers/s390/char/ctrlchar.c
index d83eb6358bac503f6a12d30ec533e9023dc458ba..0e9a309b96691d6ec1c2209bb01a6f351a3a04d6 100644 (file)
--- a/drivers/s390/char/ctrlchar.c
+++ b/drivers/s390/char/ctrlchar.c
@@ -18,12 +18,12 @@
 static int ctrlchar_sysrq_key;
 
 static void
-ctrlchar_handle_sysrq(void *tty)
+ctrlchar_handle_sysrq(struct work_struct *work)
 {
-       handle_sysrq(ctrlchar_sysrq_key, NULL, (struct tty_struct *) tty);
+       handle_sysrq(ctrlchar_sysrq_key);
 }
 
-static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq, NULL);
+static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq);
 #endif
 
 
@@ -53,7 +53,6 @@ ctrlchar_handle(const unsigned char *buf, int len, struct tty_struct *tty)
        /* racy */
        if (len == 3 && buf[1] == '-') {
                ctrlchar_sysrq_key = buf[2];
-               ctrlchar_work.data = tty;
                schedule_work(&ctrlchar_work);
                return CTRLCHAR_SYSRQ;
        }