Merge branch 'sched/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[linux-2.6-omap-h63xx.git] / arch / s390 / crypto / prng.c

diff --git a/arch/s390/crypto/prng.c b/arch/s390/crypto/prng.c
index 8eb3a1aedc228b68336824121260107ce190c3ae..6a4300b3ff52023f68ab2c614a117084cf3a0015 100644 (file)
--- 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,
@@ -185,11 +185,8 @@ static int __init prng_init(void)
        prng_seed(16);
 
        ret = misc_register(&prng_dev);
-       if (ret) {
-               printk(KERN_WARNING
-                      "Could not register misc device for PRNG.\n");
+       if (ret)
                goto out_buf;
-       }
        return 0;
 
 out_buf: