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

[linux-2.6-omap-h63xx.git] / drivers / s390 / char / con3215.c

diff --git a/drivers/s390/char/con3215.c b/drivers/s390/char/con3215.c
index 3e5653c92f4b5e5b6d1c5b1edd14b5f6eaa23af6..d3ec9b55ab351c665016c0c1fd139a6cf841fa9f 100644 (file)
--- a/drivers/s390/char/con3215.c
+++ b/drivers/s390/char/con3215.c
@@ -93,9 +93,6 @@ struct raw3215_info {
        struct raw3215_req *queued_write;/* pointer to queued write requests */
        wait_queue_head_t empty_wait; /* wait queue for flushing */
        struct timer_list timer;      /* timer for delayed output */
-       char *message;                /* pending message from raw3215_irq */
-       int msg_dstat;                /* dstat for pending message */
-       int msg_cstat;                /* cstat for pending message */
        int line_pos;                 /* position on the line (for tabs) */
        char ubuffer[80];             /* copy_from_user buffer */
 };
@@ -359,11 +356,6 @@ raw3215_tasklet(void *data)
        raw3215_mk_write_req(raw);
        raw3215_try_io(raw);
        spin_unlock_irqrestore(get_ccwdev_lock(raw->cdev), flags);
-       /* Check for pending message from raw3215_irq */
-       if (raw->message != NULL) {
-               printk(raw->message, raw->msg_dstat, raw->msg_cstat);
-               raw->message = NULL;
-       }
        tty = raw->tty;
        if (tty != NULL &&
            RAW3215_BUFFER_SIZE - raw->count >= RAW3215_MIN_SPACE) {
@@ -381,20 +373,14 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
        struct raw3215_req *req;
        struct tty_struct *tty;
        int cstat, dstat;
-       int count, slen;
+       int count;
 
        raw = cdev->dev.driver_data;
        req = (struct raw3215_req *) intparm;
-       cstat = irb->scsw.cstat;
-       dstat = irb->scsw.dstat;
-       if (cstat != 0) {
-               raw->message = KERN_WARNING
-                       "Got nonzero channel status in raw3215_irq "
-                       "(dev sts 0x%2x, sch sts 0x%2x)";
-               raw->msg_dstat = dstat;
-               raw->msg_cstat = cstat;
+       cstat = irb->scsw.cmd.cstat;
+       dstat = irb->scsw.cmd.dstat;
+       if (cstat != 0)
                tasklet_schedule(&raw->tasklet);
-       }
        if (dstat & 0x01) { /* we got a unit exception */
                dstat &= ~0x01;  /* we can ignore it */
        }
@@ -404,8 +390,6 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                        break;
                /* Attention interrupt, someone hit the enter key */
                raw3215_mk_read_req(raw);
-               if (MACHINE_IS_P390)
-                       memset(raw->inbuf, 0, RAW3215_INBUF_SIZE);
                tasklet_schedule(&raw->tasklet);
                break;
        case 0x08:
@@ -415,7 +399,7 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                        return;              /* That shouldn't happen ... */
                if (req->type == RAW3215_READ) {
                        /* store residual count, then wait for device end */
-                       req->residual = irb->scsw.count;
+                       req->residual = irb->scsw.cmd.count;
                }
                if (dstat == 0x08)
                        break;
@@ -428,11 +412,6 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
 
                        tty = raw->tty;
                        count = 160 - req->residual;
-                       if (MACHINE_IS_P390) {
-                               slen = strnlen(raw->inbuf, RAW3215_INBUF_SIZE);
-                               if (count > slen)
-                                       count = slen;
-                       } else
                        EBCASC(raw->inbuf, count);
                        cchar = ctrlchar_handle(raw->inbuf, count, tty);
                        switch (cchar & CTRLCHAR_MASK) {
@@ -481,11 +460,6 @@ raw3215_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
                        raw->flags &= ~RAW3215_WORKING;
                        raw3215_free_req(req);
                }
-               raw->message = KERN_WARNING
-                       "Spurious interrupt in in raw3215_irq "
-                       "(dev sts 0x%2x, sch sts 0x%2x)";
-               raw->msg_dstat = dstat;
-               raw->msg_cstat = cstat;
                tasklet_schedule(&raw->tasklet);
        }
        return;
@@ -883,7 +857,6 @@ con3215_init(void)
                free_bootmem((unsigned long) raw->buffer, RAW3215_BUFFER_SIZE);
                free_bootmem((unsigned long) raw, sizeof(struct raw3215_info));
                raw3215[0] = NULL;
-               printk("Couldn't find a 3215 console device\n");
                return -ENODEV;
        }
        register_console(&con3215);
@@ -1157,7 +1130,6 @@ tty3215_init(void)
        tty_set_operations(driver, &tty3215_ops);
        ret = tty_register_driver(driver);
        if (ret) {
-               printk("Couldn't register tty3215 driver\n");
                put_tty_driver(driver);
                return ret;
        }