1 files changed, 7 insertions, 5 deletions

diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index 2a4c566456e7..810ac38631c3 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -7,6 +7,7 @@
  *     Copyright IBM Corp. 2003, 2009
  */
 
+#include <linux/kernel_stat.h>
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/init.h>
@@ -329,6 +330,7 @@ raw3270_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
         struct raw3270_request *rq;
         int rc;
 
+        kstat_cpu(smp_processor_id()).irqs[IOINT_C70]++;
         rp = dev_get_drvdata(&cdev->dev);
         if (!rp)
                 return;
@@ -596,13 +598,12 @@ __raw3270_size_device(struct raw3270 *rp)
         static const unsigned char wbuf[] =
                 { 0x00, 0x07, 0x01, 0xff, 0x03, 0x00, 0x81 };
         struct raw3270_ua *uap;
-        unsigned short count;
         int rc;
 
         /*
          * To determine the size of the 3270 device we need to do:
          * 1) send a 'read partition' data stream to the device
-         * 2) wait for the attn interrupt that preceeds the query reply
+         * 2) wait for the attn interrupt that precedes the query reply
          * 3) do a read modified to get the query reply
          * To make things worse we have to cope with intervention
          * required (3270 device switched to 'stand-by') and command
@@ -651,7 +652,6 @@ __raw3270_size_device(struct raw3270 *rp)
         if (rc)
                 return rc;
         /* Got a Query Reply */
-        count = sizeof(rp->init_data) - rp->init_request.rescnt;
         uap = (struct raw3270_ua *) (rp->init_data + 1);
         /* Paranoia check. */
         if (rp->init_data[0] != 0x88 || uap->uab.qcode != 0x81)
@@ -1386,8 +1386,10 @@ static struct ccw_device_id raw3270_id[] = {
 };
 
 static struct ccw_driver raw3270_ccw_driver = {
-        .name           = "3270",
-        .owner          = THIS_MODULE,
+        .driver = {
+                .name   = "3270",
+                .owner  = THIS_MODULE,
+        },
         .ids            = raw3270_id,
         .probe          = &raw3270_probe,
         .remove         = &raw3270_remove,