s390: simplify one-level sysctl registration for topology_ctl_table

There is no need to declare an extra tables to just create directory,
this can be easily be done with a prefix path with register_sysctl().

Simplify this registration.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20230310234525.3986352-2-mcgrof@kernel.org
Reviewed-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>

diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index c6eecd4a5302d00b9ac4a0a4d92974e1ae5110b8..e5d6a1c25d13affa166a53b1402ca47cbfc10fa1 100644 (file)
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -637,16 +637,6 @@ static struct ctl_table topology_ctl_table[] = {
        { },
 };
 
-static struct ctl_table topology_dir_table[] = {
-       {
-               .procname       = "s390",
-               .maxlen         = 0,
-               .mode           = 0555,
-               .child          = topology_ctl_table,
-       },
-       { },
-};
-
 static int __init topology_init(void)
 {
        timer_setup(&topology_timer, topology_timer_fn, TIMER_DEFERRABLE);
@@ -654,7 +644,7 @@ static int __init topology_init(void)
                set_topology_timer();
        else
                topology_update_polarization_simple();
-       register_sysctl_table(topology_dir_table);
+       register_sysctl("s390", topology_ctl_table);
        return device_create_file(cpu_subsys.dev_root, &dev_attr_dispatching);
 }
 device_initcall(topology_init);