Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (72 commits)
  [S390] 3215/3270 console: remove wrong comment
  [S390] dasd: remove BKL from extended error reporting code
  [S390] vmlogrdr: remove BKL
  [S390] vmur: remove BKL
  [S390] zcrypt: remove BKL
  [S390] 3270: remove BKL
  [S390] vmwatchdog: remove lock_kernel() from open() function
  [S390] monwriter: remove lock_kernel() from open() function
  [S390] monreader: remove lock_kernel() from open() function
  [S390] s390: remove unused nfsd #includes
  [S390] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390
  [S390] etr/stp: put correct per cpu variable
  [S390] tty3270: move keyboard compat ioctls
  [S390] sclp: improve servicability setting
  [S390] s390: use change recording override for kernel mapping
  [S390] MAINTAINERS: Add s390 drivers block
  [S390] use generic sockios.h header file
  [S390] use generic termbits.h header file
  [S390] smp: remove unused typedef and defines
  [S390] cmm: free pages on hibernate.
  ...

1 files changed, 94 insertions, 317 deletions

diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index b9613d7df9ef..ae760658a131 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -229,8 +229,8 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
 
         sch = to_subchannel(cdev->dev.parent);
 
-        ccw_device_set_timeout(cdev, 0);
-        cio_disable_subchannel(sch);
+        if (cio_disable_subchannel(sch))
+                state = DEV_STATE_NOT_OPER;
         /*
          * Now that we tried recognition, we have performed device selection
          * through ssch() and the path information is up to date.
@@ -263,22 +263,10 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
         }
         switch (state) {
         case DEV_STATE_NOT_OPER:
-                CIO_MSG_EVENT(2, "SenseID : unknown device %04x on "
-                              "subchannel 0.%x.%04x\n",
-                              cdev->private->dev_id.devno,
-                              sch->schid.ssid, sch->schid.sch_no);
                 break;
         case DEV_STATE_OFFLINE:
                 if (!cdev->online) {
                         ccw_device_update_sense_data(cdev);
-                        /* Issue device info message. */
-                        CIO_MSG_EVENT(4, "SenseID : device 0.%x.%04x reports: "
-                                      "CU  Type/Mod = %04X/%02X, Dev Type/Mod "
-                                      "= %04X/%02X\n",
-                                      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;
                 }
                 cdev->private->state = DEV_STATE_OFFLINE;
@@ -289,16 +277,10 @@ ccw_device_recog_done(struct ccw_device *cdev, int state)
                         wake_up(&cdev->private->wait_q);
                 } else {
                         ccw_device_update_sense_data(cdev);
-                        PREPARE_WORK(&cdev->private->kick_work,
-                                     ccw_device_do_unbind_bind);
-                        queue_work(ccw_device_work, &cdev->private->kick_work);
+                        ccw_device_sched_todo(cdev, CDEV_TODO_REBIND);
                 }
                 return;
         case DEV_STATE_BOXED:
-                CIO_MSG_EVENT(0, "SenseID : boxed device %04x on "
-                              " subchannel 0.%x.%04x\n",
-                              cdev->private->dev_id.devno,
-                              sch->schid.ssid, sch->schid.sch_no);
                 if (cdev->id.cu_type != 0) { /* device was recognized before */
                         cdev->private->flags.recog_done = 1;
                         cdev->private->state = DEV_STATE_BOXED;
@@ -343,28 +325,16 @@ int ccw_device_notify(struct ccw_device *cdev, int event)
         return cdev->drv->notify ? cdev->drv->notify(cdev, event) : 0;
 }
 
-static void cmf_reenable_delayed(struct work_struct *work)
-{
-        struct ccw_device_private *priv;
-        struct ccw_device *cdev;
-
-        priv = container_of(work, struct ccw_device_private, kick_work);
-        cdev = priv->cdev;
-        cmf_reenable(cdev);
-}
-
 static void ccw_device_oper_notify(struct ccw_device *cdev)
 {
         if (ccw_device_notify(cdev, CIO_OPER)) {
                 /* Reenable channel measurements, if needed. */
-                PREPARE_WORK(&cdev->private->kick_work, cmf_reenable_delayed);
-                queue_work(ccw_device_work, &cdev->private->kick_work);
+                ccw_device_sched_todo(cdev, CDEV_TODO_ENABLE_CMF);
                 return;
         }
         /* Driver doesn't want device back. */
         ccw_device_set_notoper(cdev);
-        PREPARE_WORK(&cdev->private->kick_work, ccw_device_do_unbind_bind);
-        queue_work(ccw_device_work, &cdev->private->kick_work);
+        ccw_device_sched_todo(cdev, CDEV_TODO_REBIND);
 }
 
 /*
@@ -392,14 +362,14 @@ ccw_device_done(struct ccw_device *cdev, int state)
                 CIO_MSG_EVENT(0, "Boxed device %04x on subchannel %04x\n",
                               cdev->private->dev_id.devno, sch->schid.sch_no);
                 if (cdev->online && !ccw_device_notify(cdev, CIO_BOXED))
-                        ccw_device_schedule_sch_unregister(cdev);
+                        ccw_device_sched_todo(cdev, CDEV_TODO_UNREG);
                 cdev->private->flags.donotify = 0;
                 break;
         case DEV_STATE_NOT_OPER:
                 CIO_MSG_EVENT(0, "Device %04x gone on subchannel %04x\n",
                               cdev->private->dev_id.devno, sch->schid.sch_no);
                 if (!ccw_device_notify(cdev, CIO_GONE))
-                        ccw_device_schedule_sch_unregister(cdev);
+                        ccw_device_sched_todo(cdev, CDEV_TODO_UNREG);
                 else
                         ccw_device_set_disconnected(cdev);
                 cdev->private->flags.donotify = 0;
@@ -409,7 +379,7 @@ ccw_device_done(struct ccw_device *cdev, int state)
                               "%04x\n", cdev->private->dev_id.devno,
                               sch->schid.sch_no);
                 if (!ccw_device_notify(cdev, CIO_NO_PATH))
-                        ccw_device_schedule_sch_unregister(cdev);
+                        ccw_device_sched_todo(cdev, CDEV_TODO_UNREG);
                 else
                         ccw_device_set_disconnected(cdev);
                 cdev->private->flags.donotify = 0;
@@ -425,107 +395,12 @@ ccw_device_done(struct ccw_device *cdev, int state)
         wake_up(&cdev->private->wait_q);
 }
 
-static int cmp_pgid(struct pgid *p1, struct pgid *p2)
-{
-        char *c1;
-        char *c2;
-
-        c1 = (char *)p1;
-        c2 = (char *)p2;
-
-        return memcmp(c1 + 1, c2 + 1, sizeof(struct pgid) - 1);
-}
-
-static void __ccw_device_get_common_pgid(struct ccw_device *cdev)
-{
-        int i;
-        int last;
-
-        last = 0;
-        for (i = 0; i < 8; i++) {
-                if (cdev->private->pgid[i].inf.ps.state1 == SNID_STATE1_RESET)
-                        /* No PGID yet */
-                        continue;
-                if (cdev->private->pgid[last].inf.ps.state1 ==
-                    SNID_STATE1_RESET) {
-                        /* First non-zero PGID */
-                        last = i;
-                        continue;
-                }
-                if (cmp_pgid(&cdev->private->pgid[i],
-                             &cdev->private->pgid[last]) == 0)
-                        /* Non-conflicting PGIDs */
-                        continue;
-
-                /* PGID mismatch, can't pathgroup. */
-                CIO_MSG_EVENT(0, "SNID - pgid mismatch for device "
-                              "0.%x.%04x, can't pathgroup\n",
-                              cdev->private->dev_id.ssid,
-                              cdev->private->dev_id.devno);
-                cdev->private->options.pgroup = 0;
-                return;
-        }
-        if (cdev->private->pgid[last].inf.ps.state1 ==
-            SNID_STATE1_RESET)
-                /* No previous pgid found */
-                memcpy(&cdev->private->pgid[0],
-                       &channel_subsystems[0]->global_pgid,
-                       sizeof(struct pgid));
-        else
-                /* Use existing pgid */
-                memcpy(&cdev->private->pgid[0], &cdev->private->pgid[last],
-                       sizeof(struct pgid));
-}
-
-/*
- * Function called from device_pgid.c after sense path ground has completed.
- */
-void
-ccw_device_sense_pgid_done(struct ccw_device *cdev, int err)
-{
-        struct subchannel *sch;
-
-        sch = to_subchannel(cdev->dev.parent);
-        switch (err) {
-        case -EOPNOTSUPP: /* path grouping not supported, use nop instead. */
-                cdev->private->options.pgroup = 0;
-                break;
-        case 0: /* success */
-        case -EACCES: /* partial success, some paths not operational */
-                /* Check if all pgids are equal or 0. */
-                __ccw_device_get_common_pgid(cdev);
-                break;
-        case -ETIME:            /* Sense path group id stopped by timeout. */
-        case -EUSERS:           /* device is reserved for someone else. */
-                ccw_device_done(cdev, DEV_STATE_BOXED);
-                return;
-        default:
-                ccw_device_done(cdev, DEV_STATE_NOT_OPER);
-                return;
-        }
-        /* Start Path Group verification. */
-        cdev->private->state = DEV_STATE_VERIFY;
-        cdev->private->flags.doverify = 0;
-        ccw_device_verify_start(cdev);
-}
-
 /*
  * Start device recognition.
  */
-int
-ccw_device_recognition(struct ccw_device *cdev)
+void ccw_device_recognition(struct ccw_device *cdev)
 {
-        struct subchannel *sch;
-        int ret;
-
-        sch = to_subchannel(cdev->dev.parent);
-        ret = cio_enable_subchannel(sch, (u32)(addr_t)sch);
-        if (ret != 0)
-                /* Couldn't enable the subchannel for i/o. Sick device. */
-                return ret;
-
-        /* After 60s the device recognition is considered to have failed. */
-        ccw_device_set_timeout(cdev, 60*HZ);
+        struct subchannel *sch = to_subchannel(cdev->dev.parent);
 
         /*
          * We used to start here with a sense pgid to find out whether a device
@@ -537,32 +412,33 @@ ccw_device_recognition(struct ccw_device *cdev)
          */
         cdev->private->flags.recog_done = 0;
         cdev->private->state = DEV_STATE_SENSE_ID;
+        if (cio_enable_subchannel(sch, (u32) (addr_t) sch)) {
+                ccw_device_recog_done(cdev, DEV_STATE_NOT_OPER);
+                return;
+        }
         ccw_device_sense_id_start(cdev);
-        return 0;
 }
 
 /*
- * Handle timeout in device recognition.
+ * Handle events for states that use the ccw request infrastructure.
  */
-static void
-ccw_device_recog_timeout(struct ccw_device *cdev, enum dev_event dev_event)
+static void ccw_device_request_event(struct ccw_device *cdev, enum dev_event e)
 {
-        int ret;
-
-        ret = ccw_device_cancel_halt_clear(cdev);
-        switch (ret) {
-        case 0:
-                ccw_device_recog_done(cdev, DEV_STATE_BOXED);
+        switch (e) {
+        case DEV_EVENT_NOTOPER:
+                ccw_request_notoper(cdev);
                 break;
-        case -ENODEV:
-                ccw_device_recog_done(cdev, DEV_STATE_NOT_OPER);
+        case DEV_EVENT_INTERRUPT:
+                ccw_request_handler(cdev);
+                break;
+        case DEV_EVENT_TIMEOUT:
+                ccw_request_timeout(cdev);
                 break;
         default:
-                ccw_device_set_timeout(cdev, 3*HZ);
+                break;
         }
 }
 
-
 void
 ccw_device_verify_done(struct ccw_device *cdev, int err)
 {
@@ -571,21 +447,18 @@ ccw_device_verify_done(struct ccw_device *cdev, int err)
         sch = to_subchannel(cdev->dev.parent);
         /* Update schib - pom may have changed. */
         if (cio_update_schib(sch)) {
-                cdev->private->flags.donotify = 0;
-                ccw_device_done(cdev, DEV_STATE_NOT_OPER);
-                return;
+                err = -ENODEV;
+                goto callback;
         }
         /* Update lpm with verified path mask. */
         sch->lpm = sch->vpm;
         /* Repeat path verification? */
         if (cdev->private->flags.doverify) {
-                cdev->private->flags.doverify = 0;
                 ccw_device_verify_start(cdev);
                 return;
         }
+callback:
         switch (err) {
-        case -EOPNOTSUPP: /* path grouping not supported, just set online. */
-                cdev->private->options.pgroup = 0;
         case 0:
                 ccw_device_done(cdev, DEV_STATE_ONLINE);
                 /* Deliver fake irb to device driver, if needed. */
@@ -604,18 +477,20 @@ ccw_device_verify_done(struct ccw_device *cdev, int err)
                 }
                 break;
         case -ETIME:
+        case -EUSERS:
                 /* Reset oper notify indication after verify error. */
                 cdev->private->flags.donotify = 0;
                 ccw_device_done(cdev, DEV_STATE_BOXED);
                 break;
+        case -EACCES:
+                /* Reset oper notify indication after verify error. */
+                cdev->private->flags.donotify = 0;
+                ccw_device_done(cdev, DEV_STATE_DISCONNECTED);
+                break;
         default:
                 /* Reset oper notify indication after verify error. */
                 cdev->private->flags.donotify = 0;
-                if (cdev->online) {
-                        ccw_device_set_timeout(cdev, 0);
-                        dev_fsm_event(cdev, DEV_EVENT_NOTOPER);
-                } else
-                        ccw_device_done(cdev, DEV_STATE_NOT_OPER);
+                ccw_device_done(cdev, DEV_STATE_NOT_OPER);
                 break;
         }
 }
@@ -640,17 +515,9 @@ ccw_device_online(struct ccw_device *cdev)
                         dev_fsm_event(cdev, DEV_EVENT_NOTOPER);
                 return ret;
         }
-        /* Do we want to do path grouping? */
-        if (!cdev->private->options.pgroup) {
-                /* Start initial path verification. */
-                cdev->private->state = DEV_STATE_VERIFY;
-                cdev->private->flags.doverify = 0;
-                ccw_device_verify_start(cdev);
-                return 0;
-        }
-        /* Do a SensePGID first. */
-        cdev->private->state = DEV_STATE_SENSE_PGID;
-        ccw_device_sense_pgid_start(cdev);
+        /* Start initial path verification. */
+        cdev->private->state = DEV_STATE_VERIFY;
+        ccw_device_verify_start(cdev);
         return 0;
 }
 
@@ -666,7 +533,6 @@ ccw_device_disband_done(struct ccw_device *cdev, int err)
                 break;
         default:
                 cdev->private->flags.donotify = 0;
-                dev_fsm_event(cdev, DEV_EVENT_NOTOPER);
                 ccw_device_done(cdev, DEV_STATE_NOT_OPER);
                 break;
         }
@@ -703,7 +569,7 @@ ccw_device_offline(struct ccw_device *cdev)
         if (cdev->private->state != DEV_STATE_ONLINE)
                 return -EINVAL;
         /* Are we doing path grouping? */
-        if (!cdev->private->options.pgroup) {
+        if (!cdev->private->flags.pgroup) {
                 /* No, set state offline immediately. */
                 ccw_device_done(cdev, DEV_STATE_OFFLINE);
                 return 0;
@@ -715,43 +581,13 @@ ccw_device_offline(struct ccw_device *cdev)
 }
 
 /*
- * Handle timeout in device online/offline process.
- */
-static void
-ccw_device_onoff_timeout(struct ccw_device *cdev, enum dev_event dev_event)
-{
-        int ret;
-
-        ret = ccw_device_cancel_halt_clear(cdev);
-        switch (ret) {
-        case 0:
-                ccw_device_done(cdev, DEV_STATE_BOXED);
-                break;
-        case -ENODEV:
-                ccw_device_done(cdev, DEV_STATE_NOT_OPER);
-                break;
-        default:
-                ccw_device_set_timeout(cdev, 3*HZ);
-        }
-}
-
-/*
- * Handle not oper event in device recognition.
- */
-static void
-ccw_device_recog_notoper(struct ccw_device *cdev, enum dev_event dev_event)
-{
-        ccw_device_recog_done(cdev, DEV_STATE_NOT_OPER);
-}
-
-/*
  * Handle not operational event in non-special state.
  */
 static void ccw_device_generic_notoper(struct ccw_device *cdev,
                                        enum dev_event dev_event)
 {
         if (!ccw_device_notify(cdev, CIO_GONE))
-                ccw_device_schedule_sch_unregister(cdev);
+                ccw_device_sched_todo(cdev, CDEV_TODO_UNREG);
         else
                 ccw_device_set_disconnected(cdev);
 }
@@ -802,11 +638,27 @@ ccw_device_online_verify(struct ccw_device *cdev, enum dev_event dev_event)
         }
         /* Device is idle, we can do the path verification. */
         cdev->private->state = DEV_STATE_VERIFY;
-        cdev->private->flags.doverify = 0;
         ccw_device_verify_start(cdev);
 }
 
 /*
+ * Handle path verification event in boxed state.
+ */
+static void ccw_device_boxed_verify(struct ccw_device *cdev,
+                                    enum dev_event dev_event)
+{
+        struct subchannel *sch = to_subchannel(cdev->dev.parent);
+
+        if (cdev->online) {
+                if (cio_enable_subchannel(sch, (u32) (addr_t) sch))
+                        ccw_device_done(cdev, DEV_STATE_NOT_OPER);
+                else
+                        ccw_device_online_verify(cdev, dev_event);
+        } else
+                css_schedule_eval(sch->schid);
+}
+
+/*
  * Got an interrupt for a normal io (state online).
  */
 static void
@@ -904,12 +756,6 @@ ccw_device_w4sense(struct ccw_device *cdev, enum dev_event dev_event)
          */
         if (scsw_fctl(&irb->scsw) &
             (SCSW_FCTL_CLEAR_FUNC | SCSW_FCTL_HALT_FUNC)) {
-                /* Retry Basic Sense if requested. */
-                if (cdev->private->flags.intretry) {
-                        cdev->private->flags.intretry = 0;
-                        ccw_device_do_sense(cdev, irb);
-                        return;
-                }
                 cdev->private->flags.dosense = 0;
                 memset(&cdev->private->irb, 0, sizeof(struct irb));
                 ccw_device_accumulate_irb(cdev, irb);
@@ -933,21 +779,6 @@ call_handler:
 }
 
 static void
-ccw_device_clear_verify(struct ccw_device *cdev, enum dev_event dev_event)
-{
-        struct irb *irb;
-
-        irb = (struct irb *) __LC_IRB;
-        /* Accumulate status. We don't do basic sense. */
-        ccw_device_accumulate_irb(cdev, irb);
-        /* Remember to clear irb to avoid residuals. */
-        memset(&cdev->private->irb, 0, sizeof(struct irb));
-        /* Try to start delayed device verification. */
-        ccw_device_online_verify(cdev, 0);
-        /* Note: Don't call handler for cio initiated clear! */
-}
-
-static void
 ccw_device_killing_irq(struct ccw_device *cdev, enum dev_event dev_event)
 {
         struct subchannel *sch;
@@ -1004,32 +835,6 @@ ccw_device_delay_verify(struct ccw_device *cdev, enum dev_event dev_event)
 }
 
 static void
-ccw_device_stlck_done(struct ccw_device *cdev, enum dev_event dev_event)
-{
-        struct irb *irb;
-
-        switch (dev_event) {
-        case DEV_EVENT_INTERRUPT:
-                irb = (struct irb *) __LC_IRB;
-                /* Check for unsolicited interrupt. */
-                if ((scsw_stctl(&irb->scsw) ==
-                     (SCSW_STCTL_STATUS_PEND | SCSW_STCTL_ALERT_STATUS)) &&
-                    (!scsw_cc(&irb->scsw)))
-                        /* FIXME: we should restart stlck here, but this
-                         * is extremely unlikely ... */
-                        goto out_wakeup;
-
-                ccw_device_accumulate_irb(cdev, irb);
-                /* We don't care about basic sense etc. */
-                break;
-        default: /* timeout */
-                break;
-        }
-out_wakeup:
-        wake_up(&cdev->private->wait_q);
-}
-
-static void
 ccw_device_start_id(struct ccw_device *cdev, enum dev_event dev_event)
 {
         struct subchannel *sch;
@@ -1038,10 +843,6 @@ ccw_device_start_id(struct ccw_device *cdev, enum dev_event dev_event)
         if (cio_enable_subchannel(sch, (u32)(addr_t)sch) != 0)
                 /* Couldn't enable the subchannel for i/o. Sick device. */
                 return;
-
-        /* After 60s the device recognition is considered to have failed. */
-        ccw_device_set_timeout(cdev, 60*HZ);
-
         cdev->private->state = DEV_STATE_DISCONNECTED_SENSE_ID;
         ccw_device_sense_id_start(cdev);
 }
@@ -1072,22 +873,20 @@ void ccw_device_trigger_reprobe(struct ccw_device *cdev)
 
         /* We should also udate ssd info, but this has to wait. */
         /* Check if this is another device which appeared on the same sch. */
-        if (sch->schib.pmcw.dev != cdev->private->dev_id.devno) {
-                PREPARE_WORK(&cdev->private->kick_work,
-                             ccw_device_move_to_orphanage);
-                queue_work(slow_path_wq, &cdev->private->kick_work);
-        } else
+        if (sch->schib.pmcw.dev != cdev->private->dev_id.devno)
+                css_schedule_eval(sch->schid);
+        else
                 ccw_device_start_id(cdev, 0);
 }
 
-static void
-ccw_device_offline_irq(struct ccw_device *cdev, enum dev_event dev_event)
+static void ccw_device_disabled_irq(struct ccw_device *cdev,
+                                    enum dev_event dev_event)
 {
         struct subchannel *sch;
 
         sch = to_subchannel(cdev->dev.parent);
         /*
-         * An interrupt in state offline means a previous disable was not
+         * An interrupt in a disabled state means a previous disable was not
          * successful - should not happen, but we try to disable again.
          */
         cio_disable_subchannel(sch);
@@ -1113,10 +912,7 @@ static void
 ccw_device_quiesce_done(struct ccw_device *cdev, enum dev_event dev_event)
 {
         ccw_device_set_timeout(cdev, 0);
-        if (dev_event == DEV_EVENT_NOTOPER)
-                cdev->private->state = DEV_STATE_NOT_OPER;
-        else
-                cdev->private->state = DEV_STATE_OFFLINE;
+        cdev->private->state = DEV_STATE_NOT_OPER;
         wake_up(&cdev->private->wait_q);
 }
 
@@ -1126,17 +922,11 @@ ccw_device_quiesce_timeout(struct ccw_device *cdev, enum dev_event dev_event)
         int ret;
 
         ret = ccw_device_cancel_halt_clear(cdev);
-        switch (ret) {
-        case 0:
-                cdev->private->state = DEV_STATE_OFFLINE;
-                wake_up(&cdev->private->wait_q);
-                break;
-        case -ENODEV:
+        if (ret == -EBUSY) {
+                ccw_device_set_timeout(cdev, HZ/10);
+        } else {
                 cdev->private->state = DEV_STATE_NOT_OPER;
                 wake_up(&cdev->private->wait_q);
-                break;
-        default:
-                ccw_device_set_timeout(cdev, HZ/10);
         }
 }
 
@@ -1150,50 +940,37 @@ ccw_device_nop(struct ccw_device *cdev, enum dev_event dev_event)
 }
 
 /*
- * Bug operation action. 
- */
-static void
-ccw_device_bug(struct ccw_device *cdev, enum dev_event dev_event)
-{
-        CIO_MSG_EVENT(0, "Internal state [%i][%i] not handled for device "
-                      "0.%x.%04x\n", cdev->private->state, dev_event,
-                      cdev->private->dev_id.ssid,
-                      cdev->private->dev_id.devno);
-        BUG();
-}
-
-/*
  * device statemachine
  */
 fsm_func_t *dev_jumptable[NR_DEV_STATES][NR_DEV_EVENTS] = {
         [DEV_STATE_NOT_OPER] = {
                 [DEV_EVENT_NOTOPER]     = ccw_device_nop,
-                [DEV_EVENT_INTERRUPT]   = ccw_device_bug,
+                [DEV_EVENT_INTERRUPT]   = ccw_device_disabled_irq,
                 [DEV_EVENT_TIMEOUT]     = ccw_device_nop,
                 [DEV_EVENT_VERIFY]      = ccw_device_nop,
         },
         [DEV_STATE_SENSE_PGID] = {
-                [DEV_EVENT_NOTOPER]     = ccw_device_generic_notoper,
-                [DEV_EVENT_INTERRUPT]   = ccw_device_sense_pgid_irq,
-                [DEV_EVENT_TIMEOUT]     = ccw_device_onoff_timeout,
+                [DEV_EVENT_NOTOPER]     = ccw_device_request_event,
+                [DEV_EVENT_INTERRUPT]   = ccw_device_request_event,
+                [DEV_EVENT_TIMEOUT]     = ccw_device_request_event,
                 [DEV_EVENT_VERIFY]      = ccw_device_nop,
         },
         [DEV_STATE_SENSE_ID] = {
-                [DEV_EVENT_NOTOPER]     = ccw_device_recog_notoper,
-                [DEV_EVENT_INTERRUPT]   = ccw_device_sense_id_irq,
-                [DEV_EVENT_TIMEOUT]     = ccw_device_recog_timeout,
+                [DEV_EVENT_NOTOPER]     = ccw_device_request_event,
+                [DEV_EVENT_INTERRUPT]   = ccw_device_request_event,
+                [DEV_EVENT_TIMEOUT]     = ccw_device_request_event,
                 [DEV_EVENT_VERIFY]      = ccw_device_nop,
         },
         [DEV_STATE_OFFLINE] = {
                 [DEV_EVENT_NOTOPER]     = ccw_device_generic_notoper,
-                [DEV_EVENT_INTERRUPT]   = ccw_device_offline_irq,
+                [DEV_EVENT_INTERRUPT]   = ccw_device_disabled_irq,
                 [DEV_EVENT_TIMEOUT]     = ccw_device_nop,
                 [DEV_EVENT_VERIFY]      = ccw_device_offline_verify,
         },
         [DEV_STATE_VERIFY] = {
-                [DEV_EVENT_NOTOPER]     = ccw_device_generic_notoper,
-                [DEV_EVENT_INTERRUPT]   = ccw_device_verify_irq,
-                [DEV_EVENT_TIMEOUT]     = ccw_device_onoff_timeout,
+                [DEV_EVENT_NOTOPER]     = ccw_device_request_event,
+                [DEV_EVENT_INTERRUPT]   = ccw_device_request_event,
+                [DEV_EVENT_TIMEOUT]     = ccw_device_request_event,
                 [DEV_EVENT_VERIFY]      = ccw_device_delay_verify,
         },
         [DEV_STATE_ONLINE] = {
@@ -1209,24 +986,18 @@ fsm_func_t *dev_jumptable[NR_DEV_STATES][NR_DEV_EVENTS] = {
                 [DEV_EVENT_VERIFY]      = ccw_device_online_verify,
         },
         [DEV_STATE_DISBAND_PGID] = {
-                [DEV_EVENT_NOTOPER]     = ccw_device_generic_notoper,
-                [DEV_EVENT_INTERRUPT]   = ccw_device_disband_irq,
-                [DEV_EVENT_TIMEOUT]     = ccw_device_onoff_timeout,
+                [DEV_EVENT_NOTOPER]     = ccw_device_request_event,
+                [DEV_EVENT_INTERRUPT]   = ccw_device_request_event,
+                [DEV_EVENT_TIMEOUT]     = ccw_device_request_event,
                 [DEV_EVENT_VERIFY]      = ccw_device_nop,
         },
         [DEV_STATE_BOXED] = {
                 [DEV_EVENT_NOTOPER]     = ccw_device_generic_notoper,
-                [DEV_EVENT_INTERRUPT]   = ccw_device_stlck_done,
-                [DEV_EVENT_TIMEOUT]     = ccw_device_stlck_done,
-                [DEV_EVENT_VERIFY]      = ccw_device_nop,
-        },
-        /* states to wait for i/o completion before doing something */
-        [DEV_STATE_CLEAR_VERIFY] = {
-                [DEV_EVENT_NOTOPER]     = ccw_device_generic_notoper,
-                [DEV_EVENT_INTERRUPT]   = ccw_device_clear_verify,
+                [DEV_EVENT_INTERRUPT]   = ccw_device_nop,
                 [DEV_EVENT_TIMEOUT]     = ccw_device_nop,
-                [DEV_EVENT_VERIFY]      = ccw_device_nop,
+                [DEV_EVENT_VERIFY]      = ccw_device_boxed_verify,
         },
+        /* states to wait for i/o completion before doing something */
         [DEV_STATE_TIMEOUT_KILL] = {
                 [DEV_EVENT_NOTOPER]     = ccw_device_generic_notoper,
                 [DEV_EVENT_INTERRUPT]   = ccw_device_killing_irq,
@@ -1243,13 +1014,13 @@ fsm_func_t *dev_jumptable[NR_DEV_STATES][NR_DEV_EVENTS] = {
         [DEV_STATE_DISCONNECTED] = {
                 [DEV_EVENT_NOTOPER]     = ccw_device_nop,
                 [DEV_EVENT_INTERRUPT]   = ccw_device_start_id,
-                [DEV_EVENT_TIMEOUT]     = ccw_device_bug,
+                [DEV_EVENT_TIMEOUT]     = ccw_device_nop,
                 [DEV_EVENT_VERIFY]      = ccw_device_start_id,
         },
         [DEV_STATE_DISCONNECTED_SENSE_ID] = {
-                [DEV_EVENT_NOTOPER]     = ccw_device_recog_notoper,
-                [DEV_EVENT_INTERRUPT]   = ccw_device_sense_id_irq,
-                [DEV_EVENT_TIMEOUT]     = ccw_device_recog_timeout,
+                [DEV_EVENT_NOTOPER]     = ccw_device_request_event,
+                [DEV_EVENT_INTERRUPT]   = ccw_device_request_event,
+                [DEV_EVENT_TIMEOUT]     = ccw_device_request_event,
                 [DEV_EVENT_VERIFY]      = ccw_device_nop,
         },
         [DEV_STATE_CMFCHANGE] = {
@@ -1264,6 +1035,12 @@ fsm_func_t *dev_jumptable[NR_DEV_STATES][NR_DEV_EVENTS] = {
                 [DEV_EVENT_TIMEOUT]     = ccw_device_update_cmfblock,
                 [DEV_EVENT_VERIFY]      = ccw_device_update_cmfblock,
         },
+        [DEV_STATE_STEAL_LOCK] = {
+                [DEV_EVENT_NOTOPER]     = ccw_device_request_event,
+                [DEV_EVENT_INTERRUPT]   = ccw_device_request_event,
+                [DEV_EVENT_TIMEOUT]     = ccw_device_request_event,
+                [DEV_EVENT_VERIFY]      = ccw_device_nop,
+        },
 };
 
 EXPORT_SYMBOL_GPL(ccw_device_set_timeout);