[PATCH 06/15] parport: Remove the now superfluous sentinel element from ctl_table array

[Joel Granados via B4 Relay <devnull+j.granados.samsung.com@xxxxxxxxxx>]

From: Joel Granados <j.granados@xxxxxxxxxxx>

This commit comes at the tail end of a greater effort to remove the
empty elements at the end of the ctl_table arrays (sentinels) which
will reduce the overall build time size of the kernel and run time
memory bloat by ~64 bytes per sentinel (further information Link :
https://lore.kernel.org/all/ZO5Yx5JFogGi%2FcBo@xxxxxxxxxxxxxxxxxxxxxx/)

Remove the unneeded ctl_tables that were used to register intermediate
parport directories; only the path is needed at this point. From
parport_device_sysctl_table we removed: devices_root_dir, port_dir,
parport_dir and dev_dir. From parport_default_sysctl_table we removed:
default_dir, parport_dir and dev_dir. Reduce the size by one of the
ctl_table arrays that were not removed

Assign different sizes to the vars array in parport_sysctl_table
depending on CONFIG_PARPORT_1284; this is necessary now that the sysctl
register function uses ARRAY_SIZE to calculate the elements within.
Remove the sentinel element from parport_sysctl_template,
parport_device_sysctl_table and parport_default_sysctl_table.

Signed-off-by: Joel Granados <j.granados@xxxxxxxxxxx>
---
 drivers/parport/procfs.c | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
index 4e5b972c3e26..4118b3e52223 100644
--- a/drivers/parport/procfs.c
+++ b/drivers/parport/procfs.c
@@ -259,8 +259,12 @@ PARPORT_MAX_SPINTIME_VALUE;
 struct parport_sysctl_table {
        struct ctl_table_header *port_header;
        struct ctl_table_header *devices_header;
-       struct ctl_table vars[12];
-       struct ctl_table device_dir[2];
+#ifdef CONFIG_PARPORT_1284
+       struct ctl_table vars[10];
+#else
+       struct ctl_table vars[5];
+#endif /* IEEE 1284 support */
+       struct ctl_table device_dir[1];
 };
 
 static const struct parport_sysctl_table parport_sysctl_template = {
@@ -303,9 +307,9 @@ static const struct parport_sysctl_table 
parport_sysctl_template = {
                        .maxlen         = 0,
                        .mode           = 0444,
                        .proc_handler   = do_hardware_modes
-               },
+               }
 #ifdef CONFIG_PARPORT_1284
-               {
+               , {
                        .procname       = "autoprobe",
                        .data           = NULL,
                        .maxlen         = 0,
@@ -339,9 +343,8 @@ static const struct parport_sysctl_table 
parport_sysctl_template = {
                        .maxlen         = 0,
                        .mode           = 0444,
                        .proc_handler   = do_autoprobe
-               },
+               }
 #endif /* IEEE 1284 support */
-               {}
        },
        {
                {
@@ -350,20 +353,15 @@ static const struct parport_sysctl_table 
parport_sysctl_template = {
                        .maxlen         = 0,
                        .mode           = 0444,
                        .proc_handler   = do_active_device
-               },
-               {}
+               }
        },
 };
 
 struct parport_device_sysctl_table
 {
        struct ctl_table_header *sysctl_header;
-       struct ctl_table vars[2];
-       struct ctl_table device_dir[2];
-       struct ctl_table devices_root_dir[2];
-       struct ctl_table port_dir[2];
-       struct ctl_table parport_dir[2];
-       struct ctl_table dev_dir[2];
+       struct ctl_table vars[1];
+       struct ctl_table device_dir[1];
 };
 
 static const struct parport_device_sysctl_table
@@ -378,8 +376,7 @@ parport_device_sysctl_template = {
                        .proc_handler   = proc_doulongvec_ms_jiffies_minmax,
                        .extra1         = (void*) &parport_min_timeslice_value,
                        .extra2         = (void*) &parport_max_timeslice_value
-               },
-               {}
+               }
        },
        {
                {
@@ -387,18 +384,14 @@ parport_device_sysctl_template = {
                        .data           = NULL,
                        .maxlen         = 0,
                        .mode           = 0555,
-               },
-               {}
+               }
        }
 };
 
 struct parport_default_sysctl_table
 {
        struct ctl_table_header *sysctl_header;
-       struct ctl_table vars[3];
-       struct ctl_table default_dir[2];
-       struct ctl_table parport_dir[2];
-       struct ctl_table dev_dir[2];
+       struct ctl_table vars[2];
 };
 
 static struct parport_default_sysctl_table
@@ -422,8 +415,7 @@ parport_default_sysctl_table = {
                        .proc_handler   = proc_dointvec_minmax,
                        .extra1         = (void*) &parport_min_spintime_value,
                        .extra2         = (void*) &parport_max_spintime_value
-               },
-               {}
+               }
        }
 };
 
@@ -443,7 +435,9 @@ int parport_proc_register(struct parport *port)
        t->vars[0].data = &port->spintime;
        for (i = 0; i < 5; i++) {
                t->vars[i].extra1 = port;
+#ifdef CONFIG_PARPORT_1284
                t->vars[5 + i].extra2 = &port->probe_info[i];
+#endif /* IEEE 1284 support */
        }
 
        port_name_len = strnlen(port->name, PARPORT_NAME_MAX_LEN);

-- 
2.30.2