Patched in Tegra support.

1 files changed, 3 insertions, 12 deletions

diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index 7d4ecb65db0..0b7245c72d5 100644
--- a/drivers/s390/cio/device.h
+++ b/drivers/s390/cio/device.h
@@ -5,7 +5,6 @@
 #include <linux/atomic.h>
 #include <linux/wait.h>
 #include <linux/notifier.h>
-#include <linux/kernel_stat.h>
 #include "io_sch.h"
 
 /*
@@ -57,16 +56,7 @@ extern fsm_func_t *dev_jumptable[NR_DEV_STATES][NR_DEV_EVENTS];
 static inline void
 dev_fsm_event(struct ccw_device *cdev, enum dev_event dev_event)
 {
-        int state = cdev->private->state;
-
-        if (dev_event == DEV_EVENT_INTERRUPT) {
-                if (state == DEV_STATE_ONLINE)
-                        inc_irq_stat(cdev->private->int_class);
-                else if (state != DEV_STATE_CMFCHANGE &&
-                         state != DEV_STATE_CMFUPDATE)
-                        inc_irq_stat(IRQIO_CIO);
-        }
-        dev_jumptable[state][dev_event](cdev, dev_event);
+        dev_jumptable[cdev->private->state][dev_event](cdev, dev_event);
 }
 
 /*
@@ -100,7 +90,6 @@ int ccw_device_test_sense_data(struct ccw_device *);
 void ccw_device_schedule_sch_unregister(struct ccw_device *);
 int ccw_purge_blacklisted(void);
 void ccw_device_sched_todo(struct ccw_device *cdev, enum cdev_todo todo);
-struct ccw_device *get_ccwdev_by_dev_id(struct ccw_dev_id *dev_id);
 
 /* Function prototypes for device status and basic sense stuff. */
 void ccw_device_accumulate_irb(struct ccw_device *, struct irb *);
@@ -141,7 +130,9 @@ int ccw_device_notify(struct ccw_device *, int);
 void ccw_device_set_disconnected(struct ccw_device *cdev);
 void ccw_device_set_notoper(struct ccw_device *cdev);
 
+/* qdio needs this. */
 void ccw_device_set_timeout(struct ccw_device *, int);
+extern struct subchannel_id ccw_device_get_subchannel_id(struct ccw_device *);
 
 /* Channel measurement facility related */
 void retry_set_schib(struct ccw_device *cdev);