1 files changed, 9 insertions, 14 deletions

diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 07c7f19339d2..2d78f0f4a40f 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -370,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. */
@@ -444,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;
@@ -628,7 +628,7 @@ __chp_add(struct subchannel_id schid, void *data)
         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. */
@@ -707,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;
 
@@ -718,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;
 }
 
@@ -750,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;