3 files changed, 3 insertions, 63 deletions

diff --git a/arch/s390/crypto/Kconfig b/arch/s390/crypto/Kconfig
deleted file mode 100644
index d1defbbfcd81..000000000000
--- a/arch/s390/crypto/Kconfig
+++ /dev/null
@@ -1,60 +0,0 @@
-config CRYPTO_SHA1_S390
-        tristate "SHA1 digest algorithm"
-        depends on S390
-        select CRYPTO_ALGAPI
-        help
-          This is the s390 hardware accelerated implementation of the
-          SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
-
-config CRYPTO_SHA256_S390
-        tristate "SHA256 digest algorithm"
-        depends on S390
-        select CRYPTO_ALGAPI
-        help
-          This is the s390 hardware accelerated implementation of the
-          SHA256 secure hash standard (DFIPS 180-2).
-
-          This version of SHA implements a 256 bit hash with 128 bits of
-          security against collision attacks.
-
-config CRYPTO_DES_S390
-        tristate "DES and Triple DES cipher algorithms"
-        depends on S390
-        select CRYPTO_ALGAPI
-        select CRYPTO_BLKCIPHER
-        help
-          This us the s390 hardware accelerated implementation of the
-          DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
-
-config CRYPTO_AES_S390
-        tristate "AES cipher algorithms"
-        depends on S390
-        select CRYPTO_ALGAPI
-        select CRYPTO_BLKCIPHER
-        help
-          This is the s390 hardware accelerated implementation of the
-          AES cipher algorithms (FIPS-197). AES uses the Rijndael
-          algorithm.
-
-          Rijndael appears to be consistently a very good performer in
-          both hardware and software across a wide range of computing
-          environments regardless of its use in feedback or non-feedback
-          modes. Its key setup time is excellent, and its key agility is
-          good. Rijndael's very low memory requirements make it very well
-          suited for restricted-space environments, in which it also
-          demonstrates excellent performance. Rijndael's operations are
-          among the easiest to defend against power and timing attacks.
-
-          On s390 the System z9-109 currently only supports the key size
-          of 128 bit.
-
-config S390_PRNG
-        tristate "Pseudo random number generator device driver"
-        depends on S390
-        default "m"
-        help
-          Select this option if you want to use the s390 pseudo random number
-          generator. The PRNG is part of the cryptographic processor functions
-          and uses triple-DES to generate secure random numbers like the
-          ANSI X9.17 standard. The PRNG is usable via the char device
-          /dev/prandom.
diff --git a/arch/s390/crypto/aes_s390.c b/arch/s390/crypto/aes_s390.c
index 46c97058ebe1..a3f67f8b5427 100644
--- a/arch/s390/crypto/aes_s390.c
+++ b/arch/s390/crypto/aes_s390.c
@@ -516,7 +516,7 @@ static int __init aes_init(void)
         /* z9 109 and z9 BC/EC only support 128 bit key length */
         if (keylen_flag == AES_KEYLEN_128)
                 printk(KERN_INFO
-                       "aes_s390: hardware acceleration only available for"
+                       "aes_s390: hardware acceleration only available for "
                        "128 bit keys\n");
 
         ret = crypto_register_alg(&aes_alg);
diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c
index 8eb3a1aedc22..0cfefddd8375 100644
--- a/arch/s390/crypto/prng.c
+++ b/arch/s390/crypto/prng.c
@@ -90,7 +90,7 @@ static ssize_t prng_read(struct file *file, char __user *ubuf, size_t nbytes,
         int ret = 0;
         int tmp;
 
-        /* nbytes can be arbitrary long, we spilt it into chunks */
+        /* nbytes can be arbitrary length, we split it into chunks */
         while (nbytes) {
                 /* same as in extract_entropy_user in random.c */
                 if (need_resched()) {
@@ -146,7 +146,7 @@ static ssize_t prng_read(struct file *file, char __user *ubuf, size_t nbytes,
         return ret;
 }
 
-static struct file_operations prng_fops = {
+static const struct file_operations prng_fops = {
         .owner          = THIS_MODULE,
         .open           = &prng_open,
         .release        = NULL,