md: simplify sysctl registration

register_sysctl_table() is a deprecated compatibility wrapper.
register_sysctl() can do the directory creation for you so just use
that.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Acked-by: Song Liu <song@kernel.org>

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 39e49e5..0dc01f8 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -322,26 +322,6 @@ static struct ctl_table raid_table[] = {
        { }
 };
 
-static struct ctl_table raid_dir_table[] = {
-       {
-               .procname       = "raid",
-               .maxlen         = 0,
-               .mode           = S_IRUGO|S_IXUGO,
-               .child          = raid_table,
-       },
-       { }
-};
-
-static struct ctl_table raid_root_table[] = {
-       {
-               .procname       = "dev",
-               .maxlen         = 0,
-               .mode           = 0555,
-               .child          = raid_dir_table,
-       },
-       {  }
-};
-
 static int start_readonly;
 
 /*
@@ -9649,7 +9629,7 @@ static int __init md_init(void)
        mdp_major = ret;
 
        register_reboot_notifier(&md_notifier);
-       raid_table_header = register_sysctl_table(raid_root_table);
+       raid_table_header = register_sysctl("dev/raid", raid_table);
 
        md_geninit();
        return 0;