s390: remove test_facility(2) (== z/Architecture mode active) checks

Given that the kernel now always runs in 64 bit mode, it is
pointless to check if the z/Architecture mode is active.
Remove the checks.

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

1 files changed, 2 insertions, 6 deletions

diff --git a/arch/s390/crypto/crypt_s390.h b/arch/s390/crypto/crypt_s390.h
index 6c5cc6da7111..ba3b2aefddf5 100644
--- a/arch/s390/crypto/crypt_s390.h
+++ b/arch/s390/crypto/crypt_s390.h
@@ -369,14 +369,10 @@ static inline int crypt_s390_func_available(int func,
 
         if (facility_mask & CRYPT_S390_MSA && !test_facility(17))
                 return 0;
-
-        if (facility_mask & CRYPT_S390_MSA3 &&
-            (!test_facility(2) || !test_facility(76)))
+        if (facility_mask & CRYPT_S390_MSA3 && !test_facility(76))
                 return 0;
-        if (facility_mask & CRYPT_S390_MSA4 &&
-            (!test_facility(2) || !test_facility(77)))
+        if (facility_mask & CRYPT_S390_MSA4 && !test_facility(77))
                 return 0;
-
         switch (func & CRYPT_S390_OP_MASK) {
         case CRYPT_S390_KM:
                 ret = crypt_s390_km(KM_QUERY, &status, NULL, NULL, 0);