summaryrefslogtreecommitdiffstats
path: root/drivers/s390/cio/device_fsm.c
diff options
context:
space:
mode:
authorPeter Oberparleiter <oberpar@linux.vnet.ibm.com>2015-12-18 12:58:47 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2015-12-18 14:59:33 +0100
commit62e65da994768e0d599d78dd2cebef5716ffb0ae (patch)
tree46e2f6bd90eae6dd73bbd7576405c65e454bf99a /drivers/s390/cio/device_fsm.c
parentd7ae65aec0dac187d29a2963ac46574aad840a20 (diff)
downloadop-kernel-dev-62e65da994768e0d599d78dd2cebef5716ffb0ae.zip
op-kernel-dev-62e65da994768e0d599d78dd2cebef5716ffb0ae.tar.gz
s390/cio: Remove unused inline assemblies
There is no longer a need to maintain two versions of the same inline assembly - one with exception handling, and one without - so get rid of the duplicates and adjust names accordingly. This applies to stsch_err and msch_err which are now renamed to stsch and msch respectively, while the original msch function is removed. Signed-off-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com> Acked-by: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/cio/device_fsm.c')
-rw-r--r--drivers/s390/cio/device_fsm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 92e03b4..8327d47 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -44,7 +44,7 @@ static void ccw_timeout_log(struct ccw_device *cdev)
sch = to_subchannel(cdev->dev.parent);
private = to_io_private(sch);
orb = &private->orb;
- cc = stsch_err(sch->schid, &schib);
+ cc = stsch(sch->schid, &schib);
printk(KERN_WARNING "cio: ccw device timeout occurred at %llx, "
"device information:\n", get_tod_clock());
OpenPOWER on IntegriCloud