aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/chsc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/s390/cio/chsc.c')
-rw-r--r--drivers/s390/cio/chsc.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 597c0c76a2a..44a2ea40806 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -132,7 +132,7 @@ static void terminate_internal_io(struct subchannel *sch)
132 device_set_intretry(sch); 132 device_set_intretry(sch);
133 /* Call handler. */ 133 /* Call handler. */
134 if (sch->driver && sch->driver->termination) 134 if (sch->driver && sch->driver->termination)
135 sch->driver->termination(&sch->dev); 135 sch->driver->termination(sch);
136} 136}
137 137
138static int 138static int
@@ -172,12 +172,12 @@ s390_subchannel_remove_chpid(struct device *dev, void *data)
172 terminate_internal_io(sch); 172 terminate_internal_io(sch);
173 /* Re-start path verification. */ 173 /* Re-start path verification. */
174 if (sch->driver && sch->driver->verify) 174 if (sch->driver && sch->driver->verify)
175 sch->driver->verify(&sch->dev); 175 sch->driver->verify(sch);
176 } 176 }
177 } else { 177 } else {
178 /* trigger path verification. */ 178 /* trigger path verification. */
179 if (sch->driver && sch->driver->verify) 179 if (sch->driver && sch->driver->verify)
180 sch->driver->verify(&sch->dev); 180 sch->driver->verify(sch);
181 else if (sch->lpm == mask) 181 else if (sch->lpm == mask)
182 goto out_unreg; 182 goto out_unreg;
183 } 183 }
@@ -279,7 +279,7 @@ __s390_process_res_acc(struct subchannel_id schid, void *data)
279 if (!old_lpm && sch->lpm) 279 if (!old_lpm && sch->lpm)
280 device_trigger_reprobe(sch); 280 device_trigger_reprobe(sch);
281 else if (sch->driver && sch->driver->verify) 281 else if (sch->driver && sch->driver->verify)
282 sch->driver->verify(&sch->dev); 282 sch->driver->verify(sch);
283out: 283out:
284 spin_unlock_irq(sch->lock); 284 spin_unlock_irq(sch->lock);
285 put_device(&sch->dev); 285 put_device(&sch->dev);
@@ -549,7 +549,7 @@ __chp_add(struct subchannel_id schid, void *data)
549 | mask) & sch->opm; 549 | mask) & sch->opm;
550 550
551 if (sch->driver && sch->driver->verify) 551 if (sch->driver && sch->driver->verify)
552 sch->driver->verify(&sch->dev); 552 sch->driver->verify(sch);
553 553
554 spin_unlock_irq(sch->lock); 554 spin_unlock_irq(sch->lock);
555 put_device(&sch->dev); 555 put_device(&sch->dev);
@@ -589,7 +589,7 @@ static void __s390_subchannel_vary_chpid(struct subchannel *sch,
589 if (!old_lpm) 589 if (!old_lpm)
590 device_trigger_reprobe(sch); 590 device_trigger_reprobe(sch);
591 else if (sch->driver && sch->driver->verify) 591 else if (sch->driver && sch->driver->verify)
592 sch->driver->verify(&sch->dev); 592 sch->driver->verify(sch);
593 break; 593 break;
594 } 594 }
595 sch->opm &= ~mask; 595 sch->opm &= ~mask;
@@ -603,13 +603,13 @@ static void __s390_subchannel_vary_chpid(struct subchannel *sch,
603 terminate_internal_io(sch); 603 terminate_internal_io(sch);
604 /* Re-start path verification. */ 604 /* Re-start path verification. */
605 if (sch->driver && sch->driver->verify) 605 if (sch->driver && sch->driver->verify)
606 sch->driver->verify(&sch->dev); 606 sch->driver->verify(sch);
607 } 607 }
608 } else if (!sch->lpm) { 608 } else if (!sch->lpm) {
609 if (device_trigger_verify(sch) != 0) 609 if (device_trigger_verify(sch) != 0)
610 css_schedule_eval(sch->schid); 610 css_schedule_eval(sch->schid);
611 } else if (sch->driver && sch->driver->verify) 611 } else if (sch->driver && sch->driver->verify)
612 sch->driver->verify(&sch->dev); 612 sch->driver->verify(sch);
613 break; 613 break;
614 } 614 }
615 spin_unlock_irqrestore(sch->lock, flags); 615 spin_unlock_irqrestore(sch->lock, flags);