s390/sysinfo,stsi: change return code handling

Change return code handling of the stsi() function:

In case function code 0 was specified the return value is the
current configuration level (already shifted). That way all
the code that actually copied the stsi_0() function can go
away.

Otherwise the return value is 0 (success) or negative to
indicate an error (currently only -EOPNOTSUPP).

Also stsi() is no longer an inline function. The function is
not performance critical, but every caller would generate an
exception table entry for this function.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index e8000d5ff533..7f4717675c19 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -222,12 +222,12 @@ static noinline __init void detect_machine_type(void)
         struct sysinfo_3_2_2 *vmms = (struct sysinfo_3_2_2 *)&sysinfo_page;
 
         /* Check current-configuration-level */
-        if ((stsi(NULL, 0, 0, 0) >> 28) <= 2) {
+        if (stsi(NULL, 0, 0, 0) <= 2) {
                 S390_lowcore.machine_flags |= MACHINE_FLAG_LPAR;
                 return;
         }
         /* Get virtual-machine cpu information. */
-        if (stsi(vmms, 3, 2, 2) == -ENOSYS || !vmms->count)
+        if (stsi(vmms, 3, 2, 2) || !vmms->count)
                 return;
 
         /* Running under KVM? If not we assume z/VM */
@@ -246,7 +246,7 @@ static __init void setup_topology(void)
                 return;
         S390_lowcore.machine_flags |= MACHINE_FLAG_TOPOLOGY;
         for (max_mnest = 6; max_mnest > 1; max_mnest--) {
-                if (stsi(&sysinfo_page, 15, 1, max_mnest) != -ENOSYS)
+                if (stsi(&sysinfo_page, 15, 1, max_mnest) == 0)
                         break;
         }
         topology_max_mnest = max_mnest;