tty: simplify sysctl registration
authorLuis Chamberlain <mcgrof@kernel.org>
Thu, 2 Mar 2023 20:46:11 +0000 (12:46 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 9 Mar 2023 16:15:49 +0000 (17:15 +0100)
register_sysctl_table() is a deprecated compatibility wrapper.
register_sysctl_init() can do the directory creation for you so just use
that

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
Link: https://lore.kernel.org/r/20230302204612.782387-7-mcgrof@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/tty_io.c

index 36fb945..766750e 100644 (file)
@@ -3614,31 +3614,13 @@ static struct ctl_table tty_table[] = {
        { }
 };
 
-static struct ctl_table tty_dir_table[] = {
-       {
-               .procname       = "tty",
-               .mode           = 0555,
-               .child          = tty_table,
-       },
-       { }
-};
-
-static struct ctl_table tty_root_table[] = {
-       {
-               .procname       = "dev",
-               .mode           = 0555,
-               .child          = tty_dir_table,
-       },
-       { }
-};
-
 /*
  * Ok, now we can initialize the rest of the tty devices and can count
  * on memory allocations, interrupts etc..
  */
 int __init tty_init(void)
 {
-       register_sysctl_table(tty_root_table);
+       register_sysctl_init("dev/tty", tty_table);
        cdev_init(&tty_cdev, &tty_fops);
        if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) ||
            register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0)