21 files changed, 183 insertions, 202 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index d0647d116eaa..79ffef6bfaf8 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -203,6 +203,7 @@ dasd_state_basic_to_known(struct dasd_device * device)
         rc = dasd_flush_ccw_queue(device, 1);
         if (rc)
                 return rc;
+        dasd_clear_timer(device);
 
         DBF_DEV_EVENT(DBF_EMERG, device, "%p debug area deleted", device);
         if (device->debug_area != NULL) {
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index 222a8a71a5e8..53db58a68617 100644
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -218,7 +218,7 @@ dasd_diag_term_IO(struct dasd_ccw_req * cqr)
 
 /* Handle external interruption. */
 static void
-dasd_ext_handler(struct pt_regs *regs, __u16 code)
+dasd_ext_handler(__u16 code)
 {
         struct dasd_ccw_req *cqr, *next;
         struct dasd_device *device;
diff --git a/drivers/s390/char/ctrlchar.c b/drivers/s390/char/ctrlchar.c
index d83eb6358bac..49e9628d9297 100644
--- a/drivers/s390/char/ctrlchar.c
+++ b/drivers/s390/char/ctrlchar.c
@@ -20,7 +20,7 @@ static int ctrlchar_sysrq_key;
 static void
 ctrlchar_handle_sysrq(void *tty)
 {
-        handle_sysrq(ctrlchar_sysrq_key, NULL, (struct tty_struct *) tty);
+        handle_sysrq(ctrlchar_sysrq_key, (struct tty_struct *) tty);
 }
 
 static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq, NULL);
diff --git a/drivers/s390/char/keyboard.c b/drivers/s390/char/keyboard.c
index 3be06569180d..e3491a5f5219 100644
--- a/drivers/s390/char/keyboard.c
+++ b/drivers/s390/char/keyboard.c
@@ -304,7 +304,7 @@ kbd_keycode(struct kbd_data *kbd, unsigned int keycode)
                 if (kbd->sysrq) {
                         if (kbd->sysrq == K(KT_LATIN, '-')) {
                                 kbd->sysrq = 0;
-                                handle_sysrq(value, NULL, kbd->tty);
+                                handle_sysrq(value, kbd->tty);
                                 return;
                         }
                         if (value == '-') {
diff --git a/drivers/s390/char/monwriter.c b/drivers/s390/char/monwriter.c
index 1e3939aeb8ab..b9b0fc3f812b 100644
--- a/drivers/s390/char/monwriter.c
+++ b/drivers/s390/char/monwriter.c
@@ -26,6 +26,7 @@
 #define MONWRITE_MAX_DATALEN    4024
 
 static int mon_max_bufs = 255;
+static int mon_buf_count;
 
 struct mon_buf {
         struct list_head list;
@@ -40,7 +41,6 @@ struct mon_private {
         size_t hdr_to_read;
         size_t data_to_read;
         struct mon_buf *current_buf;
-        int mon_buf_count;
 };
 
 /*
@@ -73,12 +73,15 @@ static inline struct mon_buf *monwrite_find_hdr(struct mon_private *monpriv,
         struct mon_buf *entry, *next;
 
         list_for_each_entry_safe(entry, next, &monpriv->list, list)
-                if (entry->hdr.applid == monhdr->applid &&
+                if ((entry->hdr.mon_function == monhdr->mon_function ||
+                     monhdr->mon_function == MONWRITE_STOP_INTERVAL) &&
+                    entry->hdr.applid == monhdr->applid &&
                     entry->hdr.record_num == monhdr->record_num &&
                     entry->hdr.version == monhdr->version &&
                     entry->hdr.release == monhdr->release &&
                     entry->hdr.mod_level == monhdr->mod_level)
                         return entry;
+
         return NULL;
 }
 
@@ -92,25 +95,27 @@ static int monwrite_new_hdr(struct mon_private *monpriv)
             monhdr->mon_function > MONWRITE_START_CONFIG ||
             monhdr->hdrlen != sizeof(struct monwrite_hdr))
                 return -EINVAL;
-        monbuf = monwrite_find_hdr(monpriv, monhdr);
+        monbuf = NULL;
+        if (monhdr->mon_function != MONWRITE_GEN_EVENT)
+                monbuf = monwrite_find_hdr(monpriv, monhdr);
         if (monbuf) {
                 if (monhdr->mon_function == MONWRITE_STOP_INTERVAL) {
                         monhdr->datalen = monbuf->hdr.datalen;
                         rc = monwrite_diag(monhdr, monbuf->data,
                                            APPLDATA_STOP_REC);
                         list_del(&monbuf->list);
-                        monpriv->mon_buf_count--;
+                        mon_buf_count--;
                         kfree(monbuf->data);
                         kfree(monbuf);
                         monbuf = NULL;
                 }
-        } else {
-                if (monpriv->mon_buf_count >= mon_max_bufs)
+        } else if (monhdr->mon_function != MONWRITE_STOP_INTERVAL) {
+                if (mon_buf_count >= mon_max_bufs)
                         return -ENOSPC;
                 monbuf = kzalloc(sizeof(struct mon_buf), GFP_KERNEL);
                 if (!monbuf)
                         return -ENOMEM;
-                monbuf->data = kzalloc(monbuf->hdr.datalen,
+                monbuf->data = kzalloc(monhdr->datalen,
                                        GFP_KERNEL | GFP_DMA);
                 if (!monbuf->data) {
                         kfree(monbuf);
@@ -118,7 +123,8 @@ static int monwrite_new_hdr(struct mon_private *monpriv)
                 }
                 monbuf->hdr = *monhdr;
                 list_add_tail(&monbuf->list, &monpriv->list);
-                monpriv->mon_buf_count++;
+                if (monhdr->mon_function != MONWRITE_GEN_EVENT)
+                        mon_buf_count++;
         }
         monpriv->current_buf = monbuf;
         return 0;
@@ -186,7 +192,7 @@ static int monwrite_close(struct inode *inode, struct file *filp)
                 if (entry->hdr.mon_function != MONWRITE_GEN_EVENT)
                         monwrite_diag(&entry->hdr, entry->data,
                                       APPLDATA_STOP_REC);
-                monpriv->mon_buf_count--;
+                mon_buf_count--;
                 list_del(&entry->list);
                 kfree(entry->data);
                 kfree(entry);
diff --git a/drivers/s390/char/sclp.c b/drivers/s390/char/sclp.c
index 31e335751d6d..8a056df09d6b 100644
--- a/drivers/s390/char/sclp.c
+++ b/drivers/s390/char/sclp.c
@@ -324,7 +324,7 @@ __sclp_find_req(u32 sccb)
  * Prepare read event data request if necessary. Start processing of next
  * request on queue. */
 static void
-sclp_interrupt_handler(struct pt_regs *regs, __u16 code)
+sclp_interrupt_handler(__u16 code)
 {
         struct sclp_req *req;
         u32 finished_sccb;
@@ -743,7 +743,7 @@ EXPORT_SYMBOL(sclp_reactivate);
 /* Handler for external interruption used during initialization. Modify
  * request state to done. */
 static void
-sclp_check_handler(struct pt_regs *regs, __u16 code)
+sclp_check_handler(__u16 code)
 {
         u32 finished_sccb;
 
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 3bb4e472d73d..2d78f0f4a40f 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -200,11 +200,13 @@ css_get_ssd_info(struct subchannel *sch)
         spin_unlock_irq(&sch->lock);
         free_page((unsigned long)page);
         if (!ret) {
-                int j, chpid;
+                int j, chpid, mask;
                 /* Allocate channel path structures, if needed. */
                 for (j = 0; j < 8; j++) {
+                        mask = 0x80 >> j;
                         chpid = sch->ssd_info.chpid[j];
-                        if (chpid && (get_chp_status(chpid) < 0))
+                        if ((sch->schib.pmcw.pim & mask) &&
+                            (get_chp_status(chpid) < 0))
                             new_channel_path(chpid);
                 }
         }
@@ -222,13 +224,15 @@ s390_subchannel_remove_chpid(struct device *dev, void *data)
 
         sch = to_subchannel(dev);
         chpid = data;
-        for (j = 0; j < 8; j++)
-                if (sch->schib.pmcw.chpid[j] == chpid->id)
+        for (j = 0; j < 8; j++) {
+                mask = 0x80 >> j;
+                if ((sch->schib.pmcw.pim & mask) &&
+                    (sch->schib.pmcw.chpid[j] == chpid->id))
                         break;
+        }
         if (j >= 8)
                 return 0;
 
-        mask = 0x80 >> j;
         spin_lock_irq(&sch->lock);
 
         stsch(sch->schid, &schib);
@@ -366,7 +370,7 @@ __s390_process_res_acc(struct subchannel_id schid, void *data)
         struct res_acc_data *res_data;
         struct subchannel *sch;
 
-        res_data = (struct res_acc_data *)data;
+        res_data = data;
         sch = get_subchannel_by_schid(schid);
         if (!sch)
                 /* Check if a subchannel is newly available. */
@@ -440,7 +444,7 @@ __get_chpid_from_lir(void *data)
                 u32 isinfo[28];
         } *lir;
 
-        lir = (struct lir*) data;
+        lir = data;
         if (!(lir->iq&0x80))
                 /* NULL link incident record */
                 return -EINVAL;
@@ -620,18 +624,20 @@ __chp_add_new_sch(struct subchannel_id schid)
 static int
 __chp_add(struct subchannel_id schid, void *data)
 {
-        int i;
+        int i, mask;
         struct channel_path *chp;
         struct subchannel *sch;
 
-        chp = (struct channel_path *)data;
+        chp = data;
         sch = get_subchannel_by_schid(schid);
         if (!sch)
                 /* Check if the subchannel is now available. */
                 return __chp_add_new_sch(schid);
         spin_lock_irq(&sch->lock);
-        for (i=0; i<8; i++)
-                if (sch->schib.pmcw.chpid[i] == chp->id) {
+        for (i=0; i<8; i++) {
+                mask = 0x80 >> i;
+                if ((sch->schib.pmcw.pim & mask) &&
+                    (sch->schib.pmcw.chpid[i] == chp->id)) {
                         if (stsch(sch->schid, &sch->schib) != 0) {
                                 /* Endgame. */
                                 spin_unlock_irq(&sch->lock);
@@ -639,6 +645,7 @@ __chp_add(struct subchannel_id schid, void *data)
                         }
                         break;
                 }
+        }
         if (i==8) {
                 spin_unlock_irq(&sch->lock);
                 return 0;
@@ -646,7 +653,7 @@ __chp_add(struct subchannel_id schid, void *data)
         sch->lpm = ((sch->schib.pmcw.pim &
                      sch->schib.pmcw.pam &
                      sch->schib.pmcw.pom)
-                    | 0x80 >> i) & sch->opm;
+                    | mask) & sch->opm;
 
         if (sch->driver && sch->driver->verify)
                 sch->driver->verify(&sch->dev);
@@ -700,8 +707,7 @@ chp_process_crw(int chpid, int on)
         return chp_add(chpid);
 }
 
-static inline int
-__check_for_io_and_kill(struct subchannel *sch, int index)
+static inline int check_for_io_on_path(struct subchannel *sch, int index)
 {
         int cc;
 
@@ -711,10 +717,8 @@ __check_for_io_and_kill(struct subchannel *sch, int index)
         cc = stsch(sch->schid, &sch->schib);
         if (cc)
                 return 0;
-        if (sch->schib.scsw.actl && sch->schib.pmcw.lpum == (0x80 >> index)) {
-                device_set_waiting(sch);
+        if (sch->schib.scsw.actl && sch->schib.pmcw.lpum == (0x80 >> index))
                 return 1;
-        }
         return 0;
 }
 
@@ -743,12 +747,10 @@ __s390_subchannel_vary_chpid(struct subchannel *sch, __u8 chpid, int on)
                 } else {
                         sch->opm &= ~(0x80 >> chp);
                         sch->lpm &= ~(0x80 >> chp);
-                        /*
-                         * Give running I/O a grace period in which it
-                         * can successfully terminate, even using the
-                         * just varied off path. Then kill it.
-                         */
-                        if (!__check_for_io_and_kill(sch, chp) && !sch->lpm) {
+                        if (check_for_io_on_path(sch, chp))
+                                /* Path verification is done after killing. */
+                                device_kill_io(sch);
+                        else if (!sch->lpm) {
                                 if (css_enqueue_subchannel_slow(sch->schid)) {
                                         css_clear_subchannel_slow_list();
                                         need_rescan = 1;
diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index 2e2882daefbb..8936e460a807 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -19,6 +19,7 @@
 #include <asm/cio.h>
 #include <asm/delay.h>
 #include <asm/irq.h>
+#include <asm/irq_regs.h>
 #include <asm/setup.h>
 #include "airq.h"
 #include "cio.h"
@@ -606,15 +607,17 @@ do_IRQ (struct pt_regs *regs)
         struct tpi_info *tpi_info;
         struct subchannel *sch;
         struct irb *irb;
+        struct pt_regs *old_regs;
 
-        irq_enter ();
+        old_regs = set_irq_regs(regs);
+        irq_enter();
         asm volatile ("mc 0,0");
         if (S390_lowcore.int_clock >= S390_lowcore.jiffy_timer)
                 /**
                  * Make sure that the i/o interrupt did not "overtake"
                  * the last HZ timer interrupt.
                  */
-                account_ticks(regs);
+                account_ticks();
         /*
          * Get interrupt information from lowcore
          */
@@ -652,7 +655,8 @@ do_IRQ (struct pt_regs *regs)
                  * out of the sie which costs more cycles than it saves.
                  */
         } while (!MACHINE_IS_VM && tpi (NULL) != 0);
-        irq_exit ();
+        irq_exit();
+        set_irq_regs(old_regs);
 }
 
 #ifdef CONFIG_CCW_CONSOLE
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index 7086a74e9871..a2dee5bf5a17 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -177,7 +177,7 @@ get_subchannel_by_schid(struct subchannel_id schid)
         struct device *dev;
 
         dev = bus_find_device(&css_bus_type, NULL,
-                              (void *)&schid, check_subchannel);
+                              &schid, check_subchannel);
 
         return dev ? to_subchannel(dev) : NULL;
 }
diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h
index 8aabb4adeb5f..4c2ff8336288 100644
--- a/drivers/s390/cio/css.h
+++ b/drivers/s390/cio/css.h
@@ -76,9 +76,8 @@ struct ccw_device_private {
         int state;              /* device state */
         atomic_t onoff;
         unsigned long registered;
-        __u16 devno;            /* device number */
-        __u16 sch_no;           /* subchannel number */
-        __u8 ssid;              /* subchannel set id */
+        struct ccw_dev_id dev_id;       /* device id */
+        struct subchannel_id schid;     /* subchannel number */
         __u8 imask;             /* lpm mask for SNID/SID/SPGID */
         int iretry;             /* retry counter SNID/SID/SPGID */
         struct {
@@ -171,7 +170,7 @@ void device_trigger_reprobe(struct subchannel *);
 
 /* Helper functions for vary on/off. */
 int device_is_online(struct subchannel *);
-void device_set_waiting(struct subchannel *);
+void device_kill_io(struct subchannel *);
 
 /* Machine check helper function. */
 void device_kill_pending_timer(struct subchannel *);
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index 688945662c15..94bdd4d8a4c9 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -552,21 +552,19 @@ ccw_device_register(struct ccw_device *cdev)
 }
 
 struct match_data {
-        unsigned int devno;
-        unsigned int ssid;
+        struct ccw_dev_id dev_id;
         struct ccw_device * sibling;
 };
 
 static int
 match_devno(struct device * dev, void * data)
 {
-        struct match_data * d = (struct match_data *)data;
+        struct match_data * d = data;
         struct ccw_device * cdev;
 
         cdev = to_ccwdev(dev);
         if ((cdev->private->state == DEV_STATE_DISCONNECTED) &&
-            (cdev->private->devno == d->devno) &&
-            (cdev->private->ssid == d->ssid) &&
+            ccw_dev_id_is_equal(&cdev->private->dev_id, &d->dev_id) &&
             (cdev != d->sibling)) {
                 cdev->private->state = DEV_STATE_NOT_OPER;
                 return 1;
@@ -574,15 +572,13 @@ match_devno(struct device * dev, void * data)
         return 0;
 }
 
-static struct ccw_device *
-get_disc_ccwdev_by_devno(unsigned int devno, unsigned int ssid,
-                         struct ccw_device *sibling)
+static struct ccw_device * get_disc_ccwdev_by_dev_id(struct ccw_dev_id *dev_id,
+                                                     struct ccw_device *sibling)
 {
         struct device *dev;
         struct match_data data;
 
-        data.devno = devno;
-        data.ssid = ssid;
+        data.dev_id = *dev_id;
         data.sibling = sibling;
         dev = bus_find_device(&ccw_bus_type, NULL, &data, match_devno);
 
@@ -595,7 +591,7 @@ ccw_device_add_changed(void *data)
 
         struct ccw_device *cdev;
 
-        cdev = (struct ccw_device *)data;
+        cdev = data;
         if (device_add(&cdev->dev)) {
                 put_device(&cdev->dev);
                 return;
@@ -616,9 +612,9 @@ ccw_device_do_unreg_rereg(void *data)
         struct subchannel *sch;
         int need_rename;
 
-        cdev = (struct ccw_device *)data;
+        cdev = data;
         sch = to_subchannel(cdev->dev.parent);
-        if (cdev->private->devno != sch->schib.pmcw.dev) {
+        if (cdev->private->dev_id.devno != sch->schib.pmcw.dev) {
                 /*
                  * The device number has changed. This is usually only when
                  * a device has been detached under VM and then re-appeared
@@ -633,10 +629,12 @@ ccw_device_do_unreg_rereg(void *data)
                  *        get possibly sick...
                  */
                 struct ccw_device *other_cdev;
+                struct ccw_dev_id dev_id;
 
                 need_rename = 1;
-                other_cdev = get_disc_ccwdev_by_devno(sch->schib.pmcw.dev,
-                                                      sch->schid.ssid, cdev);
+                dev_id.devno = sch->schib.pmcw.dev;
+                dev_id.ssid = sch->schid.ssid;
+                other_cdev = get_disc_ccwdev_by_dev_id(&dev_id, cdev);
                 if (other_cdev) {
                         struct subchannel *other_sch;
 
@@ -652,7 +650,7 @@ ccw_device_do_unreg_rereg(void *data)
                 }
                 /* Update ssd info here. */
                 css_get_ssd_info(sch);
-                cdev->private->devno = sch->schib.pmcw.dev;
+                cdev->private->dev_id.devno = sch->schib.pmcw.dev;
         } else
                 need_rename = 0;
         device_remove_files(&cdev->dev);
@@ -662,7 +660,7 @@ ccw_device_do_unreg_rereg(void *data)
                 snprintf (cdev->dev.bus_id, BUS_ID_SIZE, "0.%x.%04x",
                           sch->schid.ssid, sch->schib.pmcw.dev);
         PREPARE_WORK(&cdev->private->kick_work,
-                     ccw_device_add_changed, (void *)cdev);
+                     ccw_device_add_changed, cdev);
         queue_work(ccw_device_work, &cdev->private->kick_work);
 }
 
@@ -687,7 +685,7 @@ io_subchannel_register(void *data)
         int ret;
         unsigned long flags;
 
-        cdev = (struct ccw_device *) data;
+        cdev = data;
         sch = to_subchannel(cdev->dev.parent);
 
         if (klist_node_attached(&cdev->dev.knode_parent)) {
@@ -759,7 +757,7 @@ io_subchannel_recog_done(struct ccw_device *cdev)
                         break;
                 sch = to_subchannel(cdev->dev.parent);
                 PREPARE_WORK(&cdev->private->kick_work,
-                             ccw_device_call_sch_unregister, (void *) cdev);
+                             ccw_device_call_sch_unregister, cdev);
                 queue_work(slow_path_wq, &cdev->private->kick_work);
                 if (atomic_dec_and_test(&ccw_device_init_count))
                         wake_up(&ccw_device_init_wq);
@@ -774,7 +772,7 @@ io_subchannel_recog_done(struct ccw_device *cdev)
                 if (!get_device(&cdev->dev))
                         break;
                 PREPARE_WORK(&cdev->private->kick_work,
-                             io_subchannel_register, (void *) cdev);
+                             io_subchannel_register, cdev);
                 queue_work(slow_path_wq, &cdev->private->kick_work);
                 break;
         }
@@ -792,9 +790,9 @@ io_subchannel_recog(struct ccw_device *cdev, struct subchannel *sch)
 
         /* Init private data. */
         priv = cdev->private;
-        priv->devno = sch->schib.pmcw.dev;
-        priv->ssid = sch->schid.ssid;
-        priv->sch_no = sch->schid.sch_no;
+        priv->dev_id.devno = sch->schib.pmcw.dev;
+        priv->dev_id.ssid = sch->schid.ssid;
+        priv->schid = sch->schid;
         priv->state = DEV_STATE_NOT_OPER;
         INIT_LIST_HEAD(&priv->cmb_list);
         init_waitqueue_head(&priv->wait_q);
@@ -912,7 +910,7 @@ io_subchannel_remove (struct subchannel *sch)
          */
         if (get_device(&cdev->dev)) {
                 PREPARE_WORK(&cdev->private->kick_work,
-                             ccw_device_unregister, (void *) cdev);
+                             ccw_device_unregister, cdev);
                 queue_work(ccw_device_work, &cdev->private->kick_work);
         }
         return 0;
@@ -1055,7 +1053,7 @@ __ccwdev_check_busid(struct device *dev, void *id)
 {
         char *bus_id;
 
-        bus_id = (char *)id;
+        bus_id = id;
 
         return (strncmp(bus_id, dev->bus_id, BUS_ID_SIZE) == 0);
 }
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index 00be9a5b4acd..c6140cc97a80 100644
--- a/drivers/s390/cio/device.h
+++ b/drivers/s390/cio/device.h
@@ -21,7 +21,6 @@ enum dev_state {
         /* states to wait for i/o completion before doing something */
         DEV_STATE_CLEAR_VERIFY,
         DEV_STATE_TIMEOUT_KILL,
-        DEV_STATE_WAIT4IO,
         DEV_STATE_QUIESCE,
         /* special states for devices gone not operational */
         DEV_STATE_DISCONNECTED,
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index dace46fc32e8..de3d0857db9f 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -59,18 +59,6 @@ device_set_disconnected(struct subchannel *sch)
         cdev->private->state = DEV_STATE_DISCONNECTED;
 }
 
-void
-device_set_waiting(struct subchannel *sch)
-{
-        struct ccw_device *cdev;
-
-        if (!sch->dev.driver_data)
-                return;
-        cdev = sch->dev.driver_data;
-        ccw_device_set_timeout(cdev, 10*HZ);
-        cdev->private->state = DEV_STATE_WAIT4IO;
-}
-
 /*
  * Timeout function. It just triggers a DEV_EVENT_TIMEOUT.
  */
@@ -183,9 +171,9 @@ ccw_device_handle_oper(struct ccw_device *cdev)
             cdev->id.cu_model != cdev->private->senseid.cu_model ||
             cdev->id.dev_type != cdev->private->senseid.dev_type ||
             cdev->id.dev_model != cdev->private->senseid.dev_model ||
-            cdev->private->devno != sch->schib.pmcw.dev) {
+            cdev->private->dev_id.devno != sch->schib.pmcw.dev) {
                 PREPARE_WORK(&cdev->private->kick_work,
-                             ccw_device_do_unreg_rereg, (void *)cdev);
+                             ccw_device_do_unreg_rereg, cdev);
                 queue_work(ccw_device_work, &cdev->private->kick_work);
                 return 0;
         }
@@ -255,7 +243,7 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
         case DEV_STATE_NOT_OPER:
                 CIO_DEBUG(KERN_WARNING, 2,
                           "SenseID : unknown device %04x on subchannel "
-                          "0.%x.%04x\n", cdev->private->devno,
+                          "0.%x.%04x\n", cdev->private->dev_id.devno,
                           sch->schid.ssid, sch->schid.sch_no);
                 break;
         case DEV_STATE_OFFLINE:
@@ -282,14 +270,15 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
                 CIO_DEBUG(KERN_INFO, 2, "SenseID : device 0.%x.%04x reports: "
                           "CU  Type/Mod = %04X/%02X, Dev Type/Mod = "
                           "%04X/%02X\n",
-                          cdev->private->ssid, cdev->private->devno,
+                          cdev->private->dev_id.ssid,
+                          cdev->private->dev_id.devno,
                           cdev->id.cu_type, cdev->id.cu_model,
                           cdev->id.dev_type, cdev->id.dev_model);
                 break;
         case DEV_STATE_BOXED:
                 CIO_DEBUG(KERN_WARNING, 2,
                           "SenseID : boxed device %04x on subchannel "
-                          "0.%x.%04x\n", cdev->private->devno,
+                          "0.%x.%04x\n", cdev->private->dev_id.devno,
                           sch->schid.ssid, sch->schid.sch_no);
                 break;
         }
@@ -325,13 +314,13 @@ ccw_device_oper_notify(void *data)
         struct subchannel *sch;
         int ret;
 
-        cdev = (struct ccw_device *)data;
+        cdev = data;
         sch = to_subchannel(cdev->dev.parent);
         ret = (sch->driver && sch->driver->notify) ?
                 sch->driver->notify(&sch->dev, CIO_OPER) : 0;
         if (!ret)
                 /* Driver doesn't want device back. */
-                ccw_device_do_unreg_rereg((void *)cdev);
+                ccw_device_do_unreg_rereg(cdev);
         else {
                 /* Reenable channel measurements, if needed. */
                 cmf_reenable(cdev);
@@ -349,6 +338,8 @@ ccw_device_done(struct ccw_device *cdev, int state)
 
         sch = to_subchannel(cdev->dev.parent);
 
+        ccw_device_set_timeout(cdev, 0);
+
         if (state != DEV_STATE_ONLINE)
                 cio_disable_subchannel(sch);
 
@@ -361,12 +352,12 @@ ccw_device_done(struct ccw_device *cdev, int state)
         if (state == DEV_STATE_BOXED)
                 CIO_DEBUG(KERN_WARNING, 2,
                           "Boxed device %04x on subchannel %04x\n",
-                          cdev->private->devno, sch->schid.sch_no);
+                          cdev->private->dev_id.devno, sch->schid.sch_no);
 
         if (cdev->private->flags.donotify) {
                 cdev->private->flags.donotify = 0;
                 PREPARE_WORK(&cdev->private->kick_work, ccw_device_oper_notify,
-                             (void *)cdev);
+                             cdev);
                 queue_work(ccw_device_notify_work, &cdev->private->kick_work);
         }
         wake_up(&cdev->private->wait_q);
@@ -410,7 +401,8 @@ static void __ccw_device_get_common_pgid(struct ccw_device *cdev)
                 /* PGID mismatch, can't pathgroup. */
                 CIO_MSG_EVENT(0, "SNID - pgid mismatch for device "
                               "0.%x.%04x, can't pathgroup\n",
-                              cdev->private->ssid, cdev->private->devno);
+                              cdev->private->dev_id.ssid,
+                              cdev->private->dev_id.devno);
                 cdev->private->options.pgroup = 0;
                 return;
         }
@@ -521,7 +513,7 @@ ccw_device_nopath_notify(void *data)
         struct subchannel *sch;
         int ret;
 
-        cdev = (struct ccw_device *)data;
+        cdev = data;
         sch = to_subchannel(cdev->dev.parent);
         /* Extra sanity. */
         if (sch->lpm)
@@ -535,7 +527,7 @@ ccw_device_nopath_notify(void *data)
                         if (get_device(&cdev->dev)) {
                                 PREPARE_WORK(&cdev->private->kick_work,
                                              ccw_device_call_sch_unregister,
-                                             (void *)cdev);
+                                             cdev);
                                 queue_work(ccw_device_work,
                                            &cdev->private->kick_work);
                         } else
@@ -586,11 +578,15 @@ ccw_device_verify_done(struct ccw_device *cdev, int err)
                 }
                 break;
         case -ETIME:
+                /* Reset oper notify indication after verify error. */
+                cdev->private->flags.donotify = 0;
                 ccw_device_done(cdev, DEV_STATE_BOXED);
                 break;
         default:
+                /* Reset oper notify indication after verify error. */
+                cdev->private->flags.donotify = 0;
                 PREPARE_WORK(&cdev->private->kick_work,
-                             ccw_device_nopath_notify, (void *)cdev);
+                             ccw_device_nopath_notify, cdev);
                 queue_work(ccw_device_notify_work, &cdev->private->kick_work);
                 ccw_device_done(cdev, DEV_STATE_NOT_OPER);
                 break;
@@ -721,7 +717,7 @@ ccw_device_offline_notoper(struct ccw_device *cdev, enum dev_event dev_event)
         sch = to_subchannel(cdev->dev.parent);
         if (get_device(&cdev->dev)) {
                 PREPARE_WORK(&cdev->private->kick_work,
-                             ccw_device_call_sch_unregister, (void *)cdev);
+                             ccw_device_call_sch_unregister, cdev);
                 queue_work(ccw_device_work, &cdev->private->kick_work);
         }
         wake_up(&cdev->private->wait_q);
@@ -752,7 +748,7 @@ ccw_device_online_notoper(struct ccw_device *cdev, enum dev_event dev_event)
         }
         if (get_device(&cdev->dev)) {
                 PREPARE_WORK(&cdev->private->kick_work,
-                             ccw_device_call_sch_unregister, (void *)cdev);
+                             ccw_device_call_sch_unregister, cdev);
                 queue_work(ccw_device_work, &cdev->private->kick_work);
         }
         wake_up(&cdev->private->wait_q);
@@ -857,7 +853,7 @@ ccw_device_online_timeout(struct ccw_device *cdev, enum dev_event dev_event)
                 sch = to_subchannel(cdev->dev.parent);
                 if (!sch->lpm) {
                         PREPARE_WORK(&cdev->private->kick_work,
-                                     ccw_device_nopath_notify, (void *)cdev);
+                                     ccw_device_nopath_notify, cdev);
                         queue_work(ccw_device_notify_work,
                                    &cdev->private->kick_work);
                 } else
@@ -883,7 +879,8 @@ ccw_device_w4sense(struct ccw_device *cdev, enum dev_event dev_event)
                         /* Basic sense hasn't started. Try again. */
                         ccw_device_do_sense(cdev, irb);
                 else {
-                        printk("Huh? %s(%s): unsolicited interrupt...\n",
+                        printk(KERN_INFO "Huh? %s(%s): unsolicited "
+                               "interrupt...\n",
                                __FUNCTION__, cdev->dev.bus_id);
                         if (cdev->handler)
                                 cdev->handler (cdev, 0, irb);
@@ -942,10 +939,10 @@ ccw_device_killing_irq(struct ccw_device *cdev, enum dev_event dev_event)
         cdev->private->state = DEV_STATE_ONLINE;
         if (cdev->handler)
                 cdev->handler(cdev, cdev->private->intparm,
-                              ERR_PTR(-ETIMEDOUT));
+                              ERR_PTR(-EIO));
         if (!sch->lpm) {
                 PREPARE_WORK(&cdev->private->kick_work,
-                             ccw_device_nopath_notify, (void *)cdev);
+                             ccw_device_nopath_notify, cdev);
                 queue_work(ccw_device_notify_work, &cdev->private->kick_work);
         } else if (cdev->private->flags.doverify)
                 /* Start delayed path verification. */
@@ -968,7 +965,7 @@ ccw_device_killing_timeout(struct ccw_device *cdev, enum dev_event dev_event)
                 sch = to_subchannel(cdev->dev.parent);
                 if (!sch->lpm) {
                         PREPARE_WORK(&cdev->private->kick_work,
-                                     ccw_device_nopath_notify, (void *)cdev);
+                                     ccw_device_nopath_notify, cdev);
                         queue_work(ccw_device_notify_work,
                                    &cdev->private->kick_work);
                 } else
@@ -979,51 +976,15 @@ ccw_device_killing_timeout(struct ccw_device *cdev, enum dev_event dev_event)
         cdev->private->state = DEV_STATE_ONLINE;
         if (cdev->handler)
                 cdev->handler(cdev, cdev->private->intparm,
-                              ERR_PTR(-ETIMEDOUT));
-}
-
-static void
-ccw_device_wait4io_irq(struct ccw_device *cdev, enum dev_event dev_event)
-{
-        struct irb *irb;
-        struct subchannel *sch;
-
-        irb = (struct irb *) __LC_IRB;
-        /*
-         * Accumulate status and find out if a basic sense is needed.
-         * This is fine since we have already adapted the lpm.
-         */
-        ccw_device_accumulate_irb(cdev, irb);
-        if (cdev->private->flags.dosense) {
-                if (ccw_device_do_sense(cdev, irb) == 0) {
-                        cdev->private->state = DEV_STATE_W4SENSE;
-                }
-                return;
-        }
-
-        /* Iff device is idle, reset timeout. */
-        sch = to_subchannel(cdev->dev.parent);
-        if (!stsch(sch->schid, &sch->schib))
-                if (sch->schib.scsw.actl == 0)
-                        ccw_device_set_timeout(cdev, 0);
-        /* Call the handler. */
-        ccw_device_call_handler(cdev);
-        if (!sch->lpm) {
-                PREPARE_WORK(&cdev->private->kick_work,
-                             ccw_device_nopath_notify, (void *)cdev);
-                queue_work(ccw_device_notify_work, &cdev->private->kick_work);
-        } else if (cdev->private->flags.doverify)
-                ccw_device_online_verify(cdev, 0);
+                              ERR_PTR(-EIO));
 }
 
-static void
-ccw_device_wait4io_timeout(struct ccw_device *cdev, enum dev_event dev_event)
+void device_kill_io(struct subchannel *sch)
 {
         int ret;
-        struct subchannel *sch;
+        struct ccw_device *cdev;
 
-        sch = to_subchannel(cdev->dev.parent);
-        ccw_device_set_timeout(cdev, 0);
+        cdev = sch->dev.driver_data;
         ret = ccw_device_cancel_halt_clear(cdev);
         if (ret == -EBUSY) {
                 ccw_device_set_timeout(cdev, 3*HZ);
@@ -1033,7 +994,7 @@ ccw_device_wait4io_timeout(struct ccw_device *cdev, enum dev_event dev_event)
         if (ret == -ENODEV) {
                 if (!sch->lpm) {
                         PREPARE_WORK(&cdev->private->kick_work,
-                                     ccw_device_nopath_notify, (void *)cdev);
+                                     ccw_device_nopath_notify, cdev);
                         queue_work(ccw_device_notify_work,
                                    &cdev->private->kick_work);
                 } else
@@ -1042,12 +1003,12 @@ ccw_device_wait4io_timeout(struct ccw_device *cdev, enum dev_event dev_event)
         }
         if (cdev->handler)
                 cdev->handler(cdev, cdev->private->intparm,
-                              ERR_PTR(-ETIMEDOUT));
+                              ERR_PTR(-EIO));
         if (!sch->lpm) {
                 PREPARE_WORK(&cdev->private->kick_work,
-                             ccw_device_nopath_notify, (void *)cdev);
+                             ccw_device_nopath_notify, cdev);
                 queue_work(ccw_device_notify_work, &cdev->private->kick_work);
-        } else if (cdev->private->flags.doverify)
+        } else
                 /* Start delayed path verification. */
                 ccw_device_online_verify(cdev, 0);
 }
@@ -1284,12 +1245,6 @@ fsm_func_t *dev_jumptable[NR_DEV_STATES][NR_DEV_EVENTS] = {
                 [DEV_EVENT_TIMEOUT]     = ccw_device_killing_timeout,
                 [DEV_EVENT_VERIFY]      = ccw_device_nop, //FIXME
         },
-        [DEV_STATE_WAIT4IO] = {
-                [DEV_EVENT_NOTOPER]     = ccw_device_online_notoper,
-                [DEV_EVENT_INTERRUPT]   = ccw_device_wait4io_irq,
-                [DEV_EVENT_TIMEOUT]     = ccw_device_wait4io_timeout,
-                [DEV_EVENT_VERIFY]      = ccw_device_delay_verify,
-        },
         [DEV_STATE_QUIESCE] = {
                 [DEV_EVENT_NOTOPER]     = ccw_device_quiesce_done,
                 [DEV_EVENT_INTERRUPT]   = ccw_device_quiesce_done,
diff --git a/drivers/s390/cio/device_id.c b/drivers/s390/cio/device_id.c
index 1398367b5f68..a74785b9e4eb 100644
--- a/drivers/s390/cio/device_id.c
+++ b/drivers/s390/cio/device_id.c
@@ -251,7 +251,7 @@ ccw_device_check_sense_id(struct ccw_device *cdev)
                  */
                 CIO_MSG_EVENT(2, "SenseID : device %04x on Subchannel "
                               "0.%x.%04x reports cmd reject\n",
-                              cdev->private->devno, sch->schid.ssid,
+                              cdev->private->dev_id.devno, sch->schid.ssid,
                               sch->schid.sch_no);
                 return -EOPNOTSUPP;
         }
@@ -259,7 +259,8 @@ ccw_device_check_sense_id(struct ccw_device *cdev)
                 CIO_MSG_EVENT(2, "SenseID : UC on dev 0.%x.%04x, "
                               "lpum %02X, cnt %02d, sns :"
                               " %02X%02X%02X%02X %02X%02X%02X%02X ...\n",
-                              cdev->private->ssid, cdev->private->devno,
+                              cdev->private->dev_id.ssid,
+                              cdev->private->dev_id.devno,
                               irb->esw.esw0.sublog.lpum,
                               irb->esw.esw0.erw.scnt,
                               irb->ecw[0], irb->ecw[1],
@@ -274,14 +275,15 @@ ccw_device_check_sense_id(struct ccw_device *cdev)
                         CIO_MSG_EVENT(2, "SenseID : path %02X for device %04x "
                                       "on subchannel 0.%x.%04x is "
                                       "'not operational'\n", sch->orb.lpm,
-                                      cdev->private->devno, sch->schid.ssid,
-                                      sch->schid.sch_no);
+                                      cdev->private->dev_id.devno,
+                                      sch->schid.ssid, sch->schid.sch_no);
                 return -EACCES;
         }
         /* Hmm, whatever happened, try again. */
         CIO_MSG_EVENT(2, "SenseID : start_IO() for device %04x on "
                       "subchannel 0.%x.%04x returns status %02X%02X\n",
-                      cdev->private->devno, sch->schid.ssid, sch->schid.sch_no,
+                      cdev->private->dev_id.devno, sch->schid.ssid,
+                      sch->schid.sch_no,
                       irb->scsw.dstat, irb->scsw.cstat);
         return -EAGAIN;
 }
@@ -330,7 +332,7 @@ ccw_device_sense_id_irq(struct ccw_device *cdev, enum dev_event dev_event)
                 /* fall through. */
         default:                /* Sense ID failed. Try asking VM. */
                 if (MACHINE_IS_VM) {
-                        VM_virtual_device_info (cdev->private->devno,
+                        VM_virtual_device_info (cdev->private->dev_id.devno,
                                                 &cdev->private->senseid);
                         if (cdev->private->senseid.cu_type != 0xFFFF) {
                                 /* Got the device information from VM. */
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index 93a897eebfff..b39c1fa48acd 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -50,7 +50,6 @@ ccw_device_clear(struct ccw_device *cdev, unsigned long intparm)
         if (cdev->private->state == DEV_STATE_NOT_OPER)
                 return -ENODEV;
         if (cdev->private->state != DEV_STATE_ONLINE &&
-            cdev->private->state != DEV_STATE_WAIT4IO &&
             cdev->private->state != DEV_STATE_W4SENSE)
                 return -EINVAL;
         sch = to_subchannel(cdev->dev.parent);
@@ -155,7 +154,6 @@ ccw_device_halt(struct ccw_device *cdev, unsigned long intparm)
         if (cdev->private->state == DEV_STATE_NOT_OPER)
                 return -ENODEV;
         if (cdev->private->state != DEV_STATE_ONLINE &&
-            cdev->private->state != DEV_STATE_WAIT4IO &&
             cdev->private->state != DEV_STATE_W4SENSE)
                 return -EINVAL;
         sch = to_subchannel(cdev->dev.parent);
@@ -216,6 +214,9 @@ ccw_device_call_handler(struct ccw_device *cdev)
               (stctl & SCSW_STCTL_PRIM_STATUS)))
                 return 0;
 
+        /* Clear pending timers for device driver initiated I/O. */
+        if (ending_status)
+                ccw_device_set_timeout(cdev, 0);
         /*
          * Now we are ready to call the device driver interrupt handler.
          */
@@ -285,10 +286,10 @@ ccw_device_wake_up(struct ccw_device *cdev, unsigned long ip, struct irb *irb)
                  if (cdev->private->flags.doverify ||
                          cdev->private->state == DEV_STATE_VERIFY)
                          cdev->private->intparm = -EAGAIN;
-                 if ((irb->scsw.dstat & DEV_STAT_UNIT_CHECK) &&
-                     !(irb->ecw[0] &
-                       (SNS0_CMD_REJECT | SNS0_INTERVENTION_REQ)))
-                         cdev->private->intparm = -EAGAIN;
+                else if ((irb->scsw.dstat & DEV_STAT_UNIT_CHECK) &&
+                         !(irb->ecw[0] &
+                           (SNS0_CMD_REJECT | SNS0_INTERVENTION_REQ)))
+                        cdev->private->intparm = -EAGAIN;
                 else if ((irb->scsw.dstat & DEV_STAT_ATTENTION) &&
                          (irb->scsw.dstat & DEV_STAT_DEV_END) &&
                          (irb->scsw.dstat & DEV_STAT_UNIT_EXCEP))
@@ -309,7 +310,10 @@ __ccw_device_retry_loop(struct ccw_device *cdev, struct ccw1 *ccw, long magic, _
 
         sch = to_subchannel(cdev->dev.parent);
         do {
+                ccw_device_set_timeout(cdev, 60 * HZ);
                 ret = cio_start (sch, ccw, lpm);
+                if (ret != 0)
+                        ccw_device_set_timeout(cdev, 0);
                 if (ret == -EBUSY) {
                         /* Try again later. */
                         spin_unlock_irq(&sch->lock);
@@ -586,13 +590,13 @@ ccw_device_get_chp_desc(struct ccw_device *cdev, int chp_no)
 int
 _ccw_device_get_subchannel_number(struct ccw_device *cdev)
 {
-        return cdev->private->sch_no;
+        return cdev->private->schid.sch_no;
 }
 
 int
 _ccw_device_get_device_number(struct ccw_device *cdev)
 {
-        return cdev->private->devno;
+        return cdev->private->dev_id.devno;
 }
 
 
diff --git a/drivers/s390/cio/device_pgid.c b/drivers/s390/cio/device_pgid.c
index 8ca2d078848c..2975ce888c19 100644
--- a/drivers/s390/cio/device_pgid.c
+++ b/drivers/s390/cio/device_pgid.c
@@ -79,7 +79,8 @@ __ccw_device_sense_pgid_start(struct ccw_device *cdev)
                         CIO_MSG_EVENT(2, "SNID - Device %04x on Subchannel "
                                       "0.%x.%04x, lpm %02X, became 'not "
                                       "operational'\n",
-                                      cdev->private->devno, sch->schid.ssid,
+                                      cdev->private->dev_id.devno,
+                                      sch->schid.ssid,
                                       sch->schid.sch_no, cdev->private->imask);
 
                 }
@@ -96,6 +97,9 @@ ccw_device_sense_pgid_start(struct ccw_device *cdev)
 {
         int ret;
 
+        /* Set a timeout of 60s */
+        ccw_device_set_timeout(cdev, 60*HZ);
+
         cdev->private->state = DEV_STATE_SENSE_PGID;
         cdev->private->imask = 0x80;
         cdev->private->iretry = 5;
@@ -132,7 +136,8 @@ __ccw_device_check_sense_pgid(struct ccw_device *cdev)
                 CIO_MSG_EVENT(2, "SNID - device 0.%x.%04x, unit check, "
                               "lpum %02X, cnt %02d, sns : "
                               "%02X%02X%02X%02X %02X%02X%02X%02X ...\n",
-                              cdev->private->ssid, cdev->private->devno,
+                              cdev->private->dev_id.ssid,
+                              cdev->private->dev_id.devno,
                               irb->esw.esw0.sublog.lpum,
                               irb->esw.esw0.erw.scnt,
                               irb->ecw[0], irb->ecw[1],
@@ -144,7 +149,7 @@ __ccw_device_check_sense_pgid(struct ccw_device *cdev)
         if (irb->scsw.cc == 3) {
                 CIO_MSG_EVENT(2, "SNID - Device %04x on Subchannel 0.%x.%04x,"
                               " lpm %02X, became 'not operational'\n",
-                              cdev->private->devno, sch->schid.ssid,
+                              cdev->private->dev_id.devno, sch->schid.ssid,
                               sch->schid.sch_no, sch->orb.lpm);
                 return -EACCES;
         }
@@ -152,7 +157,7 @@ __ccw_device_check_sense_pgid(struct ccw_device *cdev)
         if (cdev->private->pgid[i].inf.ps.state2 == SNID_STATE2_RESVD_ELSE) {
                 CIO_MSG_EVENT(2, "SNID - Device %04x on Subchannel 0.%x.%04x "
                               "is reserved by someone else\n",
-                              cdev->private->devno, sch->schid.ssid,
+                              cdev->private->dev_id.devno, sch->schid.ssid,
                               sch->schid.sch_no);
                 return -EUSERS;
         }
@@ -258,7 +263,7 @@ __ccw_device_do_pgid(struct ccw_device *cdev, __u8 func)
         /* PGID command failed on this path. */
         CIO_MSG_EVENT(2, "SPID - Device %04x on Subchannel "
                       "0.%x.%04x, lpm %02X, became 'not operational'\n",
-                      cdev->private->devno, sch->schid.ssid,
+                      cdev->private->dev_id.devno, sch->schid.ssid,
                       sch->schid.sch_no, cdev->private->imask);
         return ret;
 }
@@ -298,7 +303,7 @@ static int __ccw_device_do_nop(struct ccw_device *cdev)
         /* nop command failed on this path. */
         CIO_MSG_EVENT(2, "NOP - Device %04x on Subchannel "
                       "0.%x.%04x, lpm %02X, became 'not operational'\n",
-                      cdev->private->devno, sch->schid.ssid,
+                      cdev->private->dev_id.devno, sch->schid.ssid,
                       sch->schid.sch_no, cdev->private->imask);
         return ret;
 }
@@ -325,8 +330,9 @@ __ccw_device_check_pgid(struct ccw_device *cdev)
                 CIO_MSG_EVENT(2, "SPID - device 0.%x.%04x, unit check, "
                               "cnt %02d, "
                               "sns : %02X%02X%02X%02X %02X%02X%02X%02X ...\n",
-                              cdev->private->ssid,
-                              cdev->private->devno, irb->esw.esw0.erw.scnt,
+                              cdev->private->dev_id.ssid,
+                              cdev->private->dev_id.devno,
+                              irb->esw.esw0.erw.scnt,
                               irb->ecw[0], irb->ecw[1],
                               irb->ecw[2], irb->ecw[3],
                               irb->ecw[4], irb->ecw[5],
@@ -336,7 +342,7 @@ __ccw_device_check_pgid(struct ccw_device *cdev)
         if (irb->scsw.cc == 3) {
                 CIO_MSG_EVENT(2, "SPID - Device %04x on Subchannel 0.%x.%04x,"
                               " lpm %02X, became 'not operational'\n",
-                              cdev->private->devno, sch->schid.ssid,
+                              cdev->private->dev_id.devno, sch->schid.ssid,
                               sch->schid.sch_no, cdev->private->imask);
                 return -EACCES;
         }
@@ -359,7 +365,7 @@ static int __ccw_device_check_nop(struct ccw_device *cdev)
         if (irb->scsw.cc == 3) {
                 CIO_MSG_EVENT(2, "NOP - Device %04x on Subchannel 0.%x.%04x,"
                               " lpm %02X, became 'not operational'\n",
-                              cdev->private->devno, sch->schid.ssid,
+                              cdev->private->dev_id.devno, sch->schid.ssid,
                               sch->schid.sch_no, cdev->private->imask);
                 return -EACCES;
         }
@@ -480,6 +486,8 @@ ccw_device_verify_start(struct ccw_device *cdev)
                 ccw_device_verify_done(cdev, -ENODEV);
                 return;
         }
+        /* After 60s path verification is considered to have failed. */
+        ccw_device_set_timeout(cdev, 60*HZ);
         __ccw_device_verify_start(cdev);
 }
 
@@ -554,6 +562,9 @@ ccw_device_disband_irq(struct ccw_device *cdev, enum dev_event dev_event)
 void
 ccw_device_disband_start(struct ccw_device *cdev)
 {
+        /* After 60s disbanding is considered to have failed. */
+        ccw_device_set_timeout(cdev, 60*HZ);
+
         cdev->private->flags.pgid_single = 0;
         cdev->private->iretry = 5;
         cdev->private->imask = 0x80;
diff --git a/drivers/s390/cio/device_status.c b/drivers/s390/cio/device_status.c
index caf148d5caad..3f7cbce4cd87 100644
--- a/drivers/s390/cio/device_status.c
+++ b/drivers/s390/cio/device_status.c
@@ -32,19 +32,18 @@ ccw_device_msg_control_check(struct ccw_device *cdev, struct irb *irb)
                                  SCHN_STAT_CHN_CTRL_CHK |
                                  SCHN_STAT_INTF_CTRL_CHK)))
                 return;
-                
         CIO_MSG_EVENT(0, "Channel-Check or Interface-Control-Check "
                       "received"
                       " ... device %04x on subchannel 0.%x.%04x, dev_stat "
                       ": %02X sch_stat : %02X\n",
-                      cdev->private->devno, cdev->private->ssid,
-                      cdev->private->sch_no,
+                      cdev->private->dev_id.devno, cdev->private->schid.ssid,
+                      cdev->private->schid.sch_no,
                       irb->scsw.dstat, irb->scsw.cstat);
 
         if (irb->scsw.cc != 3) {
                 char dbf_text[15];
 
-                sprintf(dbf_text, "chk%x", cdev->private->sch_no);
+                sprintf(dbf_text, "chk%x", cdev->private->schid.sch_no);
                 CIO_TRACE_EVENT(0, dbf_text);
                 CIO_HEX_EVENT(0, irb, sizeof (struct irb));
         }
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index cde822d8b5c8..476aa1da5cbc 100644
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -1741,7 +1741,7 @@ qdio_fill_qs(struct qdio_irq *irq_ptr, struct ccw_device *cdev,
         void *ptr;
         int available;
 
-        sprintf(dbf_text,"qfqs%4x",cdev->private->sch_no);
+        sprintf(dbf_text,"qfqs%4x",cdev->private->schid.sch_no);
         QDIO_DBF_TEXT0(0,setup,dbf_text);
         for (i=0;i<no_input_qs;i++) {
                 q=irq_ptr->input_qs[i];
@@ -2924,7 +2924,7 @@ qdio_establish_handle_irq(struct ccw_device *cdev, int cstat, int dstat)
 
         irq_ptr = cdev->private->qdio_data;
 
-        sprintf(dbf_text,"qehi%4x",cdev->private->sch_no);
+        sprintf(dbf_text,"qehi%4x",cdev->private->schid.sch_no);
         QDIO_DBF_TEXT0(0,setup,dbf_text);
         QDIO_DBF_TEXT0(0,trace,dbf_text);
 
@@ -2943,7 +2943,7 @@ qdio_initialize(struct qdio_initialize *init_data)
         int rc;
         char dbf_text[15];
 
-        sprintf(dbf_text,"qini%4x",init_data->cdev->private->sch_no);
+        sprintf(dbf_text,"qini%4x",init_data->cdev->private->schid.sch_no);
         QDIO_DBF_TEXT0(0,setup,dbf_text);
         QDIO_DBF_TEXT0(0,trace,dbf_text);
 
@@ -2964,7 +2964,7 @@ qdio_allocate(struct qdio_initialize *init_data)
         struct qdio_irq *irq_ptr;
         char dbf_text[15];
 
-        sprintf(dbf_text,"qalc%4x",init_data->cdev->private->sch_no);
+        sprintf(dbf_text,"qalc%4x",init_data->cdev->private->schid.sch_no);
         QDIO_DBF_TEXT0(0,setup,dbf_text);
         QDIO_DBF_TEXT0(0,trace,dbf_text);
         if ( (init_data->no_input_qs>QDIO_MAX_QUEUES_PER_IRQ) ||
@@ -3187,7 +3187,7 @@ qdio_establish(struct qdio_initialize *init_data)
                 tiqdio_set_delay_target(irq_ptr,TIQDIO_DELAY_TARGET);
         }
 
-        sprintf(dbf_text,"qest%4x",cdev->private->sch_no);
+        sprintf(dbf_text,"qest%4x",cdev->private->schid.sch_no);
         QDIO_DBF_TEXT0(0,setup,dbf_text);
         QDIO_DBF_TEXT0(0,trace,dbf_text);
 
@@ -3529,7 +3529,7 @@ do_QDIO(struct ccw_device *cdev,unsigned int callflags,
 #ifdef CONFIG_QDIO_DEBUG
         char dbf_text[20];
 
-        sprintf(dbf_text,"doQD%04x",cdev->private->sch_no);
+        sprintf(dbf_text,"doQD%04x",cdev->private->schid.sch_no);
         QDIO_DBF_TEXT3(0,trace,dbf_text);
 #endif /* CONFIG_QDIO_DEBUG */
 
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c
index 6ed0985c0c91..c5ccd20b110c 100644
--- a/drivers/s390/crypto/ap_bus.c
+++ b/drivers/s390/crypto/ap_bus.c
@@ -449,8 +449,6 @@ static int ap_device_probe(struct device *dev)
 
         ap_dev->drv = ap_drv;
         rc = ap_drv->probe ? ap_drv->probe(ap_dev) : -ENODEV;
-        if (rc)
-                ap_dev->unregistered = 1;
         return rc;
 }
 
@@ -487,14 +485,7 @@ static int ap_device_remove(struct device *dev)
         struct ap_device *ap_dev = to_ap_dev(dev);
         struct ap_driver *ap_drv = ap_dev->drv;
 
-        spin_lock_bh(&ap_dev->lock);
-        __ap_flush_queue(ap_dev);
-        /**
-         * set ->unregistered to 1 while holding the lock. This prevents
-         * new messages to be put on the queue from now on.
-         */
-        ap_dev->unregistered = 1;
-        spin_unlock_bh(&ap_dev->lock);
+        ap_flush_queue(ap_dev);
         if (ap_drv->remove)
                 ap_drv->remove(ap_dev);
         return 0;
@@ -763,6 +754,7 @@ static void ap_scan_bus(void *data)
                         break;
                 ap_dev->qid = qid;
                 ap_dev->queue_depth = queue_depth;
+                ap_dev->unregistered = 1;
                 spin_lock_init(&ap_dev->lock);
                 INIT_LIST_HEAD(&ap_dev->pendingq);
                 INIT_LIST_HEAD(&ap_dev->requestq);
@@ -784,7 +776,12 @@ static void ap_scan_bus(void *data)
                 /* Add device attributes. */
                 rc = sysfs_create_group(&ap_dev->device.kobj,
                                         &ap_dev_attr_group);
-                if (rc)
+                if (!rc) {
+                        spin_lock_bh(&ap_dev->lock);
+                        ap_dev->unregistered = 0;
+                        spin_unlock_bh(&ap_dev->lock);
+                }
+                else
                         device_unregister(&ap_dev->device);
         }
 }
@@ -970,6 +967,8 @@ void ap_queue_message(struct ap_device *ap_dev, struct ap_message *ap_msg)
                         rc = __ap_queue_message(ap_dev, ap_msg);
                 if (!rc)
                         wake_up(&ap_poll_wait);
+                if (rc == -ENODEV)
+                        ap_dev->unregistered = 1;
         } else {
                 ap_dev->drv->receive(ap_dev, ap_msg, ERR_PTR(-ENODEV));
                 rc = 0;
@@ -1028,6 +1027,8 @@ static int __ap_poll_all(struct device *dev, void *data)
         spin_lock(&ap_dev->lock);
         if (!ap_dev->unregistered) {
                 rc = ap_poll_queue(to_ap_dev(dev), (unsigned long *) data);
+                if (rc)
+                        ap_dev->unregistered = 1;
         } else
                 rc = 0;
         spin_unlock(&ap_dev->lock);
@@ -1061,7 +1062,7 @@ static int ap_poll_thread(void *data)
         unsigned long flags;
         int requests;
 
-        set_user_nice(current, -20);
+        set_user_nice(current, 19);
         while (1) {
                 if (need_resched()) {
                         schedule();
diff --git a/drivers/s390/net/iucv.c b/drivers/s390/net/iucv.c
index 809dd8d7f47a..1476ce2b437c 100644
--- a/drivers/s390/net/iucv.c
+++ b/drivers/s390/net/iucv.c
@@ -116,7 +116,7 @@ static DEFINE_SPINLOCK(iucv_irq_queue_lock);
  *Internal function prototypes
  */
 static void iucv_tasklet_handler(unsigned long);
-static void iucv_irq_handler(struct pt_regs *, __u16);
+static void iucv_irq_handler(__u16);
 
 static DECLARE_TASKLET(iucv_tasklet,iucv_tasklet_handler,0);
 
@@ -2251,7 +2251,7 @@ iucv_sever(__u16 pathid, __u8 user_data[16])
  * Places the interrupt buffer on a queue and schedules iucv_tasklet_handler().
  */
 static void
-iucv_irq_handler(struct pt_regs *regs, __u16 code)
+iucv_irq_handler(__u16 code)
 {
         iucv_irqdata *irqdata;
 
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index 862a411a4aa0..c88babce9bca 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -1987,7 +1987,7 @@ zfcp_erp_adapter_strategy_open_qdio(struct zfcp_erp_action *erp_action)
                 sbale = &(adapter->response_queue.buffer[i]->element[0]);
                 sbale->length = 0;
                 sbale->flags = SBAL_FLAGS_LAST_ENTRY;
-                sbale->addr = 0;
+                sbale->addr = NULL;
         }
 
         ZFCP_LOG_TRACE("calling do_QDIO on adapter %s (flags=0x%x, "