s390/pci: use basic blocks for pci inline assemblies

[cascardo/linux.git] / arch / s390 / pci / pci_insn.c

diff --git a/arch/s390/pci/pci_insn.c b/arch/s390/pci/pci_insn.c
index 10ca15d..fa8d7d4 100644 (file)
--- a/arch/s390/pci/pci_insn.c
+++ b/arch/s390/pci/pci_insn.c
@@ -99,7 +99,7 @@ void zpci_set_irq_ctrl(u16 ctl, char *unused, u8 isc)
 }
 
 /* PCI Load */
-static inline int __pcilg(u64 *data, u64 req, u64 offset, u8 *status)
+static inline int ____pcilg(u64 *data, u64 req, u64 offset, u8 *status)
 {
        register u64 __req asm("2") = req;
        register u64 __offset asm("3") = offset;
@@ -116,6 +116,16 @@ static inline int __pcilg(u64 *data, u64 req, u64 offset, u8 *status)
                :  "d" (__offset)
                : "cc");
        *status = __req >> 24 & 0xff;
+       *data = __data;
+       return cc;
+}
+
+static inline int __pcilg(u64 *data, u64 req, u64 offset, u8 *status)
+{
+       u64 __data;
+       int cc;
+
+       cc = ____pcilg(&__data, req, offset, status);
        if (!cc)
                *data = __data;