1 files changed, 10 insertions, 16 deletions

diff --git a/net/rds/ib_sysctl.c b/net/rds/ib_sysctl.c
index 84b5ffcb280f..03f01cb4e0fe 100644
--- a/net/rds/ib_sysctl.c
+++ b/net/rds/ib_sysctl.c
@@ -67,68 +67,62 @@ unsigned int rds_ib_sysctl_flow_control = 0;
 
 ctl_table rds_ib_sysctl_table[] = {
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "max_send_wr",
                 .data           = &rds_ib_sysctl_max_send_wr,
                 .maxlen         = sizeof(unsigned long),
                 .mode           = 0644,
-                .proc_handler   = &proc_doulongvec_minmax,
+                .proc_handler   = proc_doulongvec_minmax,
                 .extra1         = &rds_ib_sysctl_max_wr_min,
                 .extra2         = &rds_ib_sysctl_max_wr_max,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "max_recv_wr",
                 .data           = &rds_ib_sysctl_max_recv_wr,
                 .maxlen         = sizeof(unsigned long),
                 .mode           = 0644,
-                .proc_handler   = &proc_doulongvec_minmax,
+                .proc_handler   = proc_doulongvec_minmax,
                 .extra1         = &rds_ib_sysctl_max_wr_min,
                 .extra2         = &rds_ib_sysctl_max_wr_max,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "max_unsignaled_wr",
                 .data           = &rds_ib_sysctl_max_unsig_wrs,
                 .maxlen         = sizeof(unsigned long),
                 .mode           = 0644,
-                .proc_handler   = &proc_doulongvec_minmax,
+                .proc_handler   = proc_doulongvec_minmax,
                 .extra1         = &rds_ib_sysctl_max_unsig_wr_min,
                 .extra2         = &rds_ib_sysctl_max_unsig_wr_max,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "max_unsignaled_bytes",
                 .data           = &rds_ib_sysctl_max_unsig_bytes,
                 .maxlen         = sizeof(unsigned long),
                 .mode           = 0644,
-                .proc_handler   = &proc_doulongvec_minmax,
+                .proc_handler   = proc_doulongvec_minmax,
                 .extra1         = &rds_ib_sysctl_max_unsig_bytes_min,
                 .extra2         = &rds_ib_sysctl_max_unsig_bytes_max,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "max_recv_allocation",
                 .data           = &rds_ib_sysctl_max_recv_allocation,
                 .maxlen         = sizeof(unsigned long),
                 .mode           = 0644,
-                .proc_handler   = &proc_doulongvec_minmax,
+                .proc_handler   = proc_doulongvec_minmax,
         },
         {
-                .ctl_name       = CTL_UNNUMBERED,
                 .procname       = "flow_control",
                 .data           = &rds_ib_sysctl_flow_control,
                 .maxlen         = sizeof(rds_ib_sysctl_flow_control),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
-        { .ctl_name = 0}
+        { }
 };
 
 static struct ctl_path rds_ib_sysctl_path[] = {
-        { .procname = "net", .ctl_name = CTL_NET, },
-        { .procname = "rds", .ctl_name = CTL_UNNUMBERED, },
-        { .procname = "ib", .ctl_name = CTL_UNNUMBERED, },
+        { .procname = "net", },
+        { .procname = "rds", },
+        { .procname = "ib", },
         { }
 };