1 files changed, 3 insertions, 6 deletions

diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c
index 5043150019ac..a7fe6302c982 100644
--- a/drivers/s390/char/tty3270.c
+++ b/drivers/s390/char/tty3270.c
@@ -663,7 +663,7 @@ static int
 tty3270_irq(struct tty3270 *tp, struct raw3270_request *rq, struct irb *irb)
 {
         /* Handle ATTN. Schedule tasklet to read aid. */
-        if (irb->scsw.dstat & DEV_STAT_ATTENTION) {
+        if (irb->scsw.cmd.dstat & DEV_STAT_ATTENTION) {
                 if (!tp->throttle)
                         tty3270_issue_read(tp, 0);
                 else
@@ -671,11 +671,11 @@ tty3270_irq(struct tty3270 *tp, struct raw3270_request *rq, struct irb *irb)
         }
 
         if (rq) {
-                if (irb->scsw.dstat & DEV_STAT_UNIT_CHECK)
+                if (irb->scsw.cmd.dstat & DEV_STAT_UNIT_CHECK)
                         rq->rc = -EIO;
                 else
                         /* Normal end. Copy residual count. */
-                        rq->rescnt = irb->scsw.count;
+                        rq->rescnt = irb->scsw.cmd.count;
         }
         return RAW3270_IO_DONE;
 }
@@ -1792,15 +1792,12 @@ static int __init tty3270_init(void)
         tty_set_operations(driver, &tty3270_ops);
         ret = tty_register_driver(driver);
         if (ret) {
-                printk(KERN_ERR "tty3270 registration failed with %d\n", ret);
                 put_tty_driver(driver);
                 return ret;
         }
         tty3270_driver = driver;
         ret = raw3270_register_notifier(tty3270_notifier);
         if (ret) {
-                printk(KERN_ERR "tty3270 notifier registration failed "
-                       "with %d\n", ret);
                 put_tty_driver(driver);
                 return ret;