Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[pandora-kernel.git] / drivers / s390 / char / sclp_vt220.c

diff --git a/drivers/s390/char/sclp_vt220.c b/drivers/s390/char/sclp_vt220.c
index 723bf41..7263347 100644 (file)
--- a/drivers/s390/char/sclp_vt220.c
+++ b/drivers/s390/char/sclp_vt220.c
@@ -16,7 +16,6 @@
 #include <linux/tty.h>
 #include <linux/tty_driver.h>
 #include <linux/tty_flip.h>
-#include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/mm.h>
 #include <linux/major.h>
@@ -100,8 +99,8 @@ static void sclp_vt220_emit_current(void);
 
 /* Registration structure for our interest in SCLP event buffers */
 static struct sclp_register sclp_vt220_register = {
-       .send_mask              = EvTyp_VT220Msg_Mask,
-       .receive_mask           = EvTyp_VT220Msg_Mask,
+       .send_mask              = EVTYP_VT220MSG_MASK,
+       .receive_mask           = EVTYP_VT220MSG_MASK,
        .state_change_fn        = NULL,
        .receiver_fn            = sclp_vt220_receiver_fn
 };
@@ -203,11 +202,11 @@ sclp_vt220_callback(struct sclp_req *request, void *data)
 static int
 __sclp_vt220_emit(struct sclp_vt220_request *request)
 {
-       if (!(sclp_vt220_register.sclp_send_mask & EvTyp_VT220Msg_Mask)) {
+       if (!(sclp_vt220_register.sclp_send_mask & EVTYP_VT220MSG_MASK)) {
                request->sclp_req.status = SCLP_REQ_FAILED;
                return -EIO;
        }
-       request->sclp_req.command = SCLP_CMDW_WRITEDATA;
+       request->sclp_req.command = SCLP_CMDW_WRITE_EVENT_DATA;
        request->sclp_req.status = SCLP_REQ_FILLED;
        request->sclp_req.callback = sclp_vt220_callback;
        request->sclp_req.callback_data = (void *) request;
@@ -285,7 +284,7 @@ sclp_vt220_initialize_page(void *page)
        sccb->header.length = sizeof(struct sclp_vt220_sccb);
        sccb->header.function_code = SCLP_NORMAL_WRITE;
        sccb->header.response_code = 0x0000;
-       sccb->evbuf.type = EvTyp_VT220Msg;
+       sccb->evbuf.type = EVTYP_VT220MSG;
        sccb->evbuf.length = sizeof(struct evbuf_header);
 
        return request;
@@ -669,7 +668,7 @@ static const struct tty_operations sclp_vt220_ops = {
 /*
  * Register driver with SCLP and Linux and initialize internal tty structures.
  */
-int __init
+static int __init
 sclp_vt220_tty_init(void)
 {
        struct tty_driver *driver;