diff options
| author | Peter Oberparleiter <oberpar@linux.vnet.ibm.com> | 2015-12-18 12:58:47 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2015-12-18 14:59:33 +0100 |
| commit | 62e65da994768e0d599d78dd2cebef5716ffb0ae (patch) | |
| tree | 46e2f6bd90eae6dd73bbd7576405c65e454bf99a /drivers/s390/cio/ioasm.h | |
| parent | s390/setup: cleanup machine flags (diff) | |
| download | linux-62e65da994768e0d599d78dd2cebef5716ffb0ae.tar.xz linux-62e65da994768e0d599d78dd2cebef5716ffb0ae.zip | |
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/ioasm.h')
| -rw-r--r-- | drivers/s390/cio/ioasm.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/drivers/s390/cio/ioasm.h b/drivers/s390/cio/ioasm.h index 4d80fc67a06b..be6e2f5e11f7 100644 --- a/drivers/s390/cio/ioasm.h +++ b/drivers/s390/cio/ioasm.h @@ -25,7 +25,7 @@ struct tpi_info { * Some S390 specific IO instructions as inline */ -static inline int stsch_err(struct subchannel_id schid, struct schib *addr) +static inline int stsch(struct subchannel_id schid, struct schib *addr) { register struct subchannel_id reg1 asm ("1") = schid; int ccode = -EIO; @@ -45,21 +45,6 @@ static inline int stsch_err(struct subchannel_id schid, struct schib *addr) static inline int msch(struct subchannel_id schid, struct schib *addr) { register struct subchannel_id reg1 asm ("1") = schid; - int ccode; - - asm volatile( - " msch 0(%2)\n" - " ipm %0\n" - " srl %0,28" - : "=d" (ccode) - : "d" (reg1), "a" (addr), "m" (*addr) - : "cc"); - return ccode; -} - -static inline int msch_err(struct subchannel_id schid, struct schib *addr) -{ - register struct subchannel_id reg1 asm ("1") = schid; int ccode = -EIO; asm volatile( |