sysctl: Drop & in front of every proc_handler.

For consistency drop & in front of every proc_handler.  Explicity
taking the address is unnecessary and it prevents optimizations
like stubbing the proc_handlers to NULL.

Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>

12 files changed, 38 insertions, 38 deletions

diff --git a/arch/arm/kernel/isa.c b/arch/arm/kernel/isa.c
index 738dfcc658ca..346485910732 100644
--- a/arch/arm/kernel/isa.c
+++ b/arch/arm/kernel/isa.c
@@ -26,19 +26,19 @@ static ctl_table ctl_isa_vars[4] = {
                 .data           = &isa_membase, 
                 .maxlen         = sizeof(isa_membase),
                 .mode           = 0444,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         }, {
                 .procname       = "portbase",
                 .data           = &isa_portbase, 
                 .maxlen         = sizeof(isa_portbase),
                 .mode           = 0444,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         }, {
                 .procname       = "portshift",
                 .data           = &isa_portshift, 
                 .maxlen         = sizeof(isa_portshift),
                 .mode           = 0444,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         }, {}
 };
 
diff --git a/arch/arm/mach-bcmring/arch.c b/arch/arm/mach-bcmring/arch.c
index f3c11199707a..fbe6fa02c882 100644
--- a/arch/arm/mach-bcmring/arch.c
+++ b/arch/arm/mach-bcmring/arch.c
@@ -58,7 +58,7 @@ static struct ctl_table bcmring_sysctl_warm_reboot[] = {
          .data = &bcmring_arch_warm_reboot,
          .maxlen = sizeof(int),
          .mode = 0644,
-         .proc_handler = &proc_dointvec},
+         .proc_handler = proc_dointvec},
         {}
 };
 
diff --git a/arch/frv/kernel/pm.c b/arch/frv/kernel/pm.c
index 940d8bb486f8..5fa3889d858b 100644
--- a/arch/frv/kernel/pm.c
+++ b/arch/frv/kernel/pm.c
@@ -303,28 +303,28 @@ static struct ctl_table pm_table[] =
                 .data           = NULL,
                 .maxlen         = 0,
                 .mode           = 0200,
-                .proc_handler   = &sysctl_pm_do_suspend,
+                .proc_handler   = sysctl_pm_do_suspend,
         },
         {
                 .procname       = "cmode",
                 .data           = &clock_cmode_current,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &cmode_procctl,
+                .proc_handler   = cmode_procctl,
         },
         {
                 .procname       = "p0",
                 .data           = &clock_p0_current,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &p0_procctl,
+                .proc_handler   = p0_procctl,
         },
         {
                 .procname       = "cm",
                 .data           = &clock_cm_current,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &cm_procctl,
+                .proc_handler   = cm_procctl,
         },
         { }
 };
diff --git a/arch/frv/kernel/sysctl.c b/arch/frv/kernel/sysctl.c
index b30a4f2cda3e..035516cb7a97 100644
--- a/arch/frv/kernel/sysctl.c
+++ b/arch/frv/kernel/sysctl.c
@@ -180,7 +180,7 @@ static struct ctl_table frv_table[] =
                 .data           = NULL,
                 .maxlen         = 0,
                 .mode           = 0644,
-                .proc_handler   = &procctl_frv_cachemode,
+                .proc_handler   = procctl_frv_cachemode,
         },
 #ifdef CONFIG_MMU
         {
@@ -188,7 +188,7 @@ static struct ctl_table frv_table[] =
                 .data           = NULL,
                 .maxlen         = 0,
                 .mode           = 0644,
-                .proc_handler   = &procctl_frv_pin_cxnr
+                .proc_handler   = procctl_frv_pin_cxnr
         },
 #endif
         {}
diff --git a/arch/ia64/kernel/crash.c b/arch/ia64/kernel/crash.c
index 7c7d6a6dc0f7..b942f4032d7a 100644
--- a/arch/ia64/kernel/crash.c
+++ b/arch/ia64/kernel/crash.c
@@ -243,14 +243,14 @@ static ctl_table kdump_ctl_table[] = {
                 .data = &kdump_on_init,
                 .maxlen = sizeof(int),
                 .mode = 0644,
-                .proc_handler = &proc_dointvec,
+                .proc_handler = proc_dointvec,
         },
         {
                 .procname = "kdump_on_fatal_mca",
                 .data = &kdump_on_fatal_mca,
                 .maxlen = sizeof(int),
                 .mode = 0644,
-                .proc_handler = &proc_dointvec,
+                .proc_handler = proc_dointvec,
         },
         { }
 };
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index ca30b3646405..402698b6689f 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -526,28 +526,28 @@ static ctl_table pfm_ctl_table[]={
                 .data           = &pfm_sysctl.debug,
                 .maxlen         = sizeof(int),
                 .mode           = 0666,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
         {
                 .procname       = "debug_ovfl",
                 .data           = &pfm_sysctl.debug_ovfl,
                 .maxlen         = sizeof(int),
                 .mode           = 0666,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
         {
                 .procname       = "fastctxsw",
                 .data           = &pfm_sysctl.fastctxsw,
                 .maxlen         = sizeof(int),
                 .mode           = 0600,
-                .proc_handler   =  &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
         {
                 .procname       = "expert_mode",
                 .data           = &pfm_sysctl.expert_mode,
                 .maxlen         = sizeof(int),
                 .mode           = 0600,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
         {}
 };
diff --git a/arch/mips/lasat/sysctl.c b/arch/mips/lasat/sysctl.c
index 1dbdd76a8c04..14b9a28a4aec 100644
--- a/arch/mips/lasat/sysctl.c
+++ b/arch/mips/lasat/sysctl.c
@@ -182,28 +182,28 @@ static ctl_table lasat_table[] = {
                 .data           = &lasat_board_info.li_cpu_hz,
                 .maxlen         = sizeof(int),
                 .mode           = 0444,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
         {
                 .procname       = "bus-hz",
                 .data           = &lasat_board_info.li_bus_hz,
                 .maxlen         = sizeof(int),
                 .mode           = 0444,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
         {
                 .procname       = "bmid",
                 .data           = &lasat_board_info.li_bmid,
                 .maxlen         = sizeof(int),
                 .mode           = 0444,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
         {
                 .procname       = "prid",
                 .data           = &lasat_board_info.li_prid,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_lasat_prid,
+                .proc_handler   = proc_lasat_prid,
 .       },
 #ifdef CONFIG_INET
         {
@@ -211,14 +211,14 @@ static ctl_table lasat_table[] = {
                 .data           = &lasat_board_info.li_eeprom_info.ipaddr,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_lasat_ip,
+                .proc_handler   = proc_lasat_ip,
         },
         {
                 .procname       = "netmask",
                 .data           = &lasat_board_info.li_eeprom_info.netmask,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_lasat_ip,
+                .proc_handler   = proc_lasat_ip,
         },
 #endif
         {
@@ -227,14 +227,14 @@ static ctl_table lasat_table[] = {
                 .maxlen         =
                         sizeof(lasat_board_info.li_eeprom_info.passwd_hash),
                 .mode           = 0600,
-                .proc_handler   = &proc_dolasatstring,
+                .proc_handler   = proc_dolasatstring,
         },
         {
                 .procname       = "boot-service",
                 .data           = &lasat_boot_to_service,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
 #ifdef CONFIG_DS1603
         {
@@ -242,7 +242,7 @@ static ctl_table lasat_table[] = {
                 .data           = &rtctmp,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dolasatrtc,
+                .proc_handler   = proc_dolasatrtc,
         },
 #endif
         {
@@ -250,14 +250,14 @@ static ctl_table lasat_table[] = {
                 .data           = &lasat_board_info.li_namestr,
                 .maxlen         = sizeof(lasat_board_info.li_namestr),
                 .mode           = 0444,
-                .proc_handler   = &proc_dostring,
+                .proc_handler   = proc_dostring,
         },
         {
                 .procname       = "typestr",
                 .data           = &lasat_board_info.li_typestr,
                 .maxlen         = sizeof(lasat_board_info.li_typestr),
                 .mode           = 0444,
-                .proc_handler   = &proc_dostring,
+                .proc_handler   = proc_dostring,
         },
         {}
 };
diff --git a/arch/powerpc/kernel/idle.c b/arch/powerpc/kernel/idle.c
index cece9e2cc5e4..049dda60e475 100644
--- a/arch/powerpc/kernel/idle.c
+++ b/arch/powerpc/kernel/idle.c
@@ -114,7 +114,7 @@ static ctl_table powersave_nap_ctl_table[]={
                 .data           = &powersave_nap,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
         {}
 };
diff --git a/arch/s390/appldata/appldata_base.c b/arch/s390/appldata/appldata_base.c
index b55fd7ed1c31..495589950dc7 100644
--- a/arch/s390/appldata/appldata_base.c
+++ b/arch/s390/appldata/appldata_base.c
@@ -61,12 +61,12 @@ static struct ctl_table appldata_table[] = {
         {
                 .procname       = "timer",
                 .mode           = S_IRUGO | S_IWUSR,
-                .proc_handler   = &appldata_timer_handler,
+                .proc_handler   = appldata_timer_handler,
         },
         {
                 .procname       = "interval",
                 .mode           = S_IRUGO | S_IWUSR,
-                .proc_handler   = &appldata_interval_handler,
+                .proc_handler   = appldata_interval_handler,
         },
         { },
 };
diff --git a/arch/s390/kernel/debug.c b/arch/s390/kernel/debug.c
index adf11260260a..071c81f179ef 100644
--- a/arch/s390/kernel/debug.c
+++ b/arch/s390/kernel/debug.c
@@ -897,14 +897,14 @@ static struct ctl_table s390dbf_table[] = {
                 .data           = &debug_stoppable,
                 .maxlen         = sizeof(int),
                 .mode           = S_IRUGO | S_IWUSR,
-                .proc_handler   = &proc_dointvec,
+                .proc_handler   = proc_dointvec,
         },
          {
                 .procname       = "debug_active",
                 .data           = &debug_active,
                 .maxlen         = sizeof(int),
                 .mode           = S_IRUGO | S_IWUSR,
-                .proc_handler   = &s390dbf_procactive,
+                .proc_handler   = s390dbf_procactive,
         },
         { }
 };
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
index dab3e4a7582e..ff58779bf7e9 100644
--- a/arch/s390/mm/cmm.c
+++ b/arch/s390/mm/cmm.c
@@ -343,17 +343,17 @@ static struct ctl_table cmm_table[] = {
         {
                 .procname       = "cmm_pages",
                 .mode           = 0644,
-                .proc_handler   = &cmm_pages_handler,
+                .proc_handler   = cmm_pages_handler,
         },
         {
                 .procname       = "cmm_timed_pages",
                 .mode           = 0644,
-                .proc_handler   = &cmm_pages_handler,
+                .proc_handler   = cmm_pages_handler,
         },
         {
                 .procname       = "cmm_timeout",
                 .mode           = 0644,
-                .proc_handler   = &cmm_timeout_handler,
+                .proc_handler   = cmm_timeout_handler,
         },
         { }
 };
diff --git a/arch/sh/kernel/traps_64.c b/arch/sh/kernel/traps_64.c
index 080c8ee2d862..75c0cbe2eda0 100644
--- a/arch/sh/kernel/traps_64.c
+++ b/arch/sh/kernel/traps_64.c
@@ -881,21 +881,21 @@ static ctl_table unaligned_table[] = {
                 .data           = &kernel_mode_unaligned_fixup_count,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec
+                .proc_handler   = proc_dointvec
         },
         {
                 .procname       = "user_reports",
                 .data           = &user_mode_unaligned_fixup_count,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec
+                .proc_handler   = proc_dointvec
         },
         {
                 .procname       = "user_enable",
                 .data           = &user_mode_unaligned_fixup_enable,
                 .maxlen         = sizeof(int),
                 .mode           = 0644,
-                .proc_handler   = &proc_dointvec},
+                .proc_handler   = proc_dointvec},
         {}
 };