test_sysctl: Group node sysctl test under one func

Preparation commit to add a new type of test to test_sysctl.c. We
want to differentiate between node and (sub)directory tests.

Signed-off-by: Joel Granados <j.granados@samsung.com>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>

diff --git a/lib/test_sysctl.c b/lib/test_sysctl.c
index e2a816d85ea2472277c7ca95ecfbd5592bf6f824..0cf7c547d61ae1257e82ea38f72e1c4323723d33 100644 (file)
--- a/lib/test_sysctl.c
+++ b/lib/test_sysctl.c
@@ -126,9 +126,7 @@ static struct ctl_table test_table[] = {
        { }
 };
 
-static struct ctl_table_header *test_sysctl_header;
-
-static int __init test_sysctl_init(void)
+static void test_sysctl_calc_match_int_ok(void)
 {
        int i;
 
@@ -153,7 +151,13 @@ static int __init test_sysctl_init(void)
        for (i = 0; i < ARRAY_SIZE(match_int); i++)
                if (match_int[i].defined != match_int[i].wanted)
                        match_int_ok = 0;
+}
 
+static struct ctl_table_header *test_sysctl_header;
+
+static int test_sysctl_setup_node_tests(void)
+{
+       test_sysctl_calc_match_int_ok();
        test_data.bitmap_0001 = kzalloc(SYSCTL_TEST_BITMAP_SIZE/8, GFP_KERNEL);
        if (!test_data.bitmap_0001)
                return -ENOMEM;
@@ -162,8 +166,18 @@ static int __init test_sysctl_init(void)
                kfree(test_data.bitmap_0001);
                return -ENOMEM;
        }
+
        return 0;
 }
+
+static int __init test_sysctl_init(void)
+{
+       int err;
+
+       err = test_sysctl_setup_node_tests();
+
+       return err;
+}
 module_init(test_sysctl_init);
 
 static void __exit test_sysctl_exit(void)