[CRYPTO]: Cleanups based upon feedback from jgarzik.

- make crypto_cipher_flags() return u32 (this means it will return
  the actual flags reliably, instead of being just a boolean op).
- simplify error path in crypto_init_flags().

2 files changed, 3 insertions, 2 deletions

diff --git a/crypto/api.c b/crypto/api.c
index 51cd1a8113dcb5..5a29cb8c93f693 100644
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -67,9 +67,10 @@ static int crypto_init_flags(struct crypto_tfm *tfm, u32 flags)
 		return crypto_init_compress_flags(tfm, flags);
 	
 	default:
-		BUG();
+		break;
 	}
 	
+	BUG();
 	return -EINVAL;
 }
 
diff --git a/crypto/internal.h b/crypto/internal.h
index c1904830595049..204a3b18ccc8ce 100644
--- a/crypto/internal.h
+++ b/crypto/internal.h
@@ -35,7 +35,7 @@ static inline void crypto_yield(struct crypto_tfm *tfm)
 		cond_resched();
 }
 
-static inline int crypto_cipher_flags(u32 flags)
+static inline u32 crypto_cipher_flags(u32 flags)
 {
 	return flags & (CRYPTO_TFM_MODE_MASK|CRYPTO_TFM_REQ_WEAK_KEY);
 }