Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[~andy/linux] / crypto / proc.c

diff --git a/crypto/proc.c b/crypto/proc.c
index 37a13d05636d4beaaea521d4538aa711e8bbb627..1c38733c224d7785ead6a3f47258937073544f68 100644 (file)
--- a/crypto/proc.c
+++ b/crypto/proc.c
@@ -25,28 +25,22 @@
 #ifdef CONFIG_CRYPTO_FIPS
 static struct ctl_table crypto_sysctl_table[] = {
        {
-               .ctl_name       = CTL_UNNUMBERED,
                .procname       = "fips_enabled",
                .data           = &fips_enabled,
                .maxlen         = sizeof(int),
                .mode           = 0444,
-               .proc_handler   = &proc_dointvec
-       },
-       {
-               .ctl_name = 0,
+               .proc_handler   = proc_dointvec
        },
+       {}
 };
 
 static struct ctl_table crypto_dir_table[] = {
        {
-               .ctl_name       = CTL_UNNUMBERED,
                .procname       = "crypto",
                .mode           = 0555,
                .child          = crypto_sysctl_table
        },
-       {
-               .ctl_name = 0,
-       },
+       {}
 };
 
 static struct ctl_table_header *crypto_sysctls;
@@ -94,6 +88,17 @@ static int c_show(struct seq_file *m, void *p)
        seq_printf(m, "selftest     : %s\n",
                   (alg->cra_flags & CRYPTO_ALG_TESTED) ?
                   "passed" : "unknown");
+
+       if (alg->cra_flags & CRYPTO_ALG_LARVAL) {
+               seq_printf(m, "type         : larval\n");
+               seq_printf(m, "flags        : 0x%x\n", alg->cra_flags);
+               goto out;
+       }
+
+       if (alg->cra_type && alg->cra_type->show) {
+               alg->cra_type->show(m, alg);
+               goto out;
+       }
        
        switch (alg->cra_flags & (CRYPTO_ALG_TYPE_MASK | CRYPTO_ALG_LARVAL)) {
        case CRYPTO_ALG_TYPE_CIPHER:
@@ -115,16 +120,11 @@ static int c_show(struct seq_file *m, void *p)
                seq_printf(m, "type         : compression\n");
                break;
        default:
-               if (alg->cra_flags & CRYPTO_ALG_LARVAL) {
-                       seq_printf(m, "type         : larval\n");
-                       seq_printf(m, "flags        : 0x%x\n", alg->cra_flags);
-               } else if (alg->cra_type && alg->cra_type->show)
-                       alg->cra_type->show(m, alg);
-               else
-                       seq_printf(m, "type         : unknown\n");
+               seq_printf(m, "type         : unknown\n");
                break;
        }
 
+out:
        seq_putc(m, '\n');
        return 0;
 }