aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2009-11-16 06:11:48 -0500
committerEric W. Biederman <ebiederm@xmission.com>2009-11-18 11:37:40 -0500
commit6d4561110a3e9fa742aeec6717248a491dfb1878 (patch)
tree689e2abf19940416ce597ba56ed31026ff59bd21 /drivers
parent86926d0096279b9739ceeff40f68d3c33b9119a9 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/cdrom/cdrom.c12
-rw-r--r--drivers/char/hpet.c2
-rw-r--r--drivers/char/ipmi/ipmi_poweroff.c2
-rw-r--r--drivers/char/pty.c4
-rw-r--r--drivers/char/random.c12
-rw-r--r--drivers/char/rtc.c2
-rw-r--r--drivers/macintosh/mac_hid.c6
-rw-r--r--drivers/md/md.c4
-rw-r--r--drivers/misc/sgi-xp/xpc_main.c6
-rw-r--r--drivers/net/wireless/arlan-proc.c64
-rw-r--r--drivers/parport/procfs.c28
-rw-r--r--drivers/scsi/scsi_sysctl.c2
12 files changed, 72 insertions, 72 deletions
diff --git a/drivers/cdrom/cdrom.c b/drivers/cdrom/cdrom.c
index 1872b6dc168a..e3749d0ba68b 100644
--- a/drivers/cdrom/cdrom.c
+++ b/drivers/cdrom/cdrom.c
@@ -3557,42 +3557,42 @@ static ctl_table cdrom_table[] = {
3557 .data = &cdrom_sysctl_settings.info, 3557 .data = &cdrom_sysctl_settings.info,
3558 .maxlen = CDROM_STR_SIZE, 3558 .maxlen = CDROM_STR_SIZE,
3559 .mode = 0444, 3559 .mode = 0444,
3560 .proc_handler = &cdrom_sysctl_info, 3560 .proc_handler = cdrom_sysctl_info,
3561 }, 3561 },
3562 { 3562 {
3563 .procname = "autoclose", 3563 .procname = "autoclose",
3564 .data = &cdrom_sysctl_settings.autoclose, 3564 .data = &cdrom_sysctl_settings.autoclose,
3565 .maxlen = sizeof(int), 3565 .maxlen = sizeof(int),
3566 .mode = 0644, 3566 .mode = 0644,
3567 .proc_handler = &cdrom_sysctl_handler, 3567 .proc_handler = cdrom_sysctl_handler,
3568 }, 3568 },
3569 { 3569 {
3570 .procname = "autoeject", 3570 .procname = "autoeject",
3571 .data = &cdrom_sysctl_settings.autoeject, 3571 .data = &cdrom_sysctl_settings.autoeject,
3572 .maxlen = sizeof(int), 3572 .maxlen = sizeof(int),
3573 .mode = 0644, 3573 .mode = 0644,
3574 .proc_handler = &cdrom_sysctl_handler, 3574 .proc_handler = cdrom_sysctl_handler,
3575 }, 3575 },
3576 { 3576 {
3577 .procname = "debug", 3577 .procname = "debug",
3578 .data = &cdrom_sysctl_settings.debug, 3578 .data = &cdrom_sysctl_settings.debug,
3579 .maxlen = sizeof(int), 3579 .maxlen = sizeof(int),
3580 .mode = 0644, 3580 .mode = 0644,
3581 .proc_handler = &cdrom_sysctl_handler, 3581 .proc_handler = cdrom_sysctl_handler,
3582 }, 3582 },
3583 { 3583 {
3584 .procname = "lock", 3584 .procname = "lock",
3585 .data = &cdrom_sysctl_settings.lock, 3585 .data = &cdrom_sysctl_settings.lock,
3586 .maxlen = sizeof(int), 3586 .maxlen = sizeof(int),
3587 .mode = 0644, 3587 .mode = 0644,
3588 .proc_handler = &cdrom_sysctl_handler, 3588 .proc_handler = cdrom_sysctl_handler,
3589 }, 3589 },
3590 { 3590 {
3591 .procname = "check_media", 3591 .procname = "check_media",
3592 .data = &cdrom_sysctl_settings.check, 3592 .data = &cdrom_sysctl_settings.check,
3593 .maxlen = sizeof(int), 3593 .maxlen = sizeof(int),
3594 .mode = 0644, 3594 .mode = 0644,
3595 .proc_handler = &cdrom_sysctl_handler 3595 .proc_handler = cdrom_sysctl_handler
3596 }, 3596 },
3597 { } 3597 { }
3598}; 3598};
diff --git a/drivers/char/hpet.c b/drivers/char/hpet.c
index a05a6112240b..e481c5938bad 100644
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
@@ -679,7 +679,7 @@ static ctl_table hpet_table[] = {
679 .data = &hpet_max_freq, 679 .data = &hpet_max_freq,
680 .maxlen = sizeof(int), 680 .maxlen = sizeof(int),
681 .mode = 0644, 681 .mode = 0644,
682 .proc_handler = &proc_dointvec, 682 .proc_handler = proc_dointvec,
683 }, 683 },
684 {} 684 {}
685}; 685};
diff --git a/drivers/char/ipmi/ipmi_poweroff.c b/drivers/char/ipmi/ipmi_poweroff.c
index aa39722696dd..0dec5da000ef 100644
--- a/drivers/char/ipmi/ipmi_poweroff.c
+++ b/drivers/char/ipmi/ipmi_poweroff.c
@@ -664,7 +664,7 @@ static ctl_table ipmi_table[] = {
664 .data = &poweroff_powercycle, 664 .data = &poweroff_powercycle,
665 .maxlen = sizeof(poweroff_powercycle), 665 .maxlen = sizeof(poweroff_powercycle),
666 .mode = 0644, 666 .mode = 0644,
667 .proc_handler = &proc_dointvec }, 667 .proc_handler = proc_dointvec },
668 { } 668 { }
669}; 669};
670 670
diff --git a/drivers/char/pty.c b/drivers/char/pty.c
index d516e9ced3c2..d86c0bc05c1c 100644
--- a/drivers/char/pty.c
+++ b/drivers/char/pty.c
@@ -435,7 +435,7 @@ static struct ctl_table pty_table[] = {
435 .maxlen = sizeof(int), 435 .maxlen = sizeof(int),
436 .mode = 0644, 436 .mode = 0644,
437 .data = &pty_limit, 437 .data = &pty_limit,
438 .proc_handler = &proc_dointvec_minmax, 438 .proc_handler = proc_dointvec_minmax,
439 .extra1 = &pty_limit_min, 439 .extra1 = &pty_limit_min,
440 .extra2 = &pty_limit_max, 440 .extra2 = &pty_limit_max,
441 }, { 441 }, {
@@ -443,7 +443,7 @@ static struct ctl_table pty_table[] = {
443 .maxlen = sizeof(int), 443 .maxlen = sizeof(int),
444 .mode = 0444, 444 .mode = 0444,
445 .data = &pty_count, 445 .data = &pty_count,
446 .proc_handler = &proc_dointvec, 446 .proc_handler = proc_dointvec,
447 }, 447 },
448 {} 448 {}
449}; 449};
diff --git a/drivers/char/random.c b/drivers/char/random.c
index bcf680f9ff58..dcd08635cf1b 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1264,13 +1264,13 @@ ctl_table random_table[] = {
1264 .data = &sysctl_poolsize, 1264 .data = &sysctl_poolsize,
1265 .maxlen = sizeof(int), 1265 .maxlen = sizeof(int),
1266 .mode = 0444, 1266 .mode = 0444,
1267 .proc_handler = &proc_dointvec, 1267 .proc_handler = proc_dointvec,
1268 }, 1268 },
1269 { 1269 {
1270 .procname = "entropy_avail", 1270 .procname = "entropy_avail",
1271 .maxlen = sizeof(int), 1271 .maxlen = sizeof(int),
1272 .mode = 0444, 1272 .mode = 0444,
1273 .proc_handler = &proc_dointvec, 1273 .proc_handler = proc_dointvec,
1274 .data = &input_pool.entropy_count, 1274 .data = &input_pool.entropy_count,
1275 }, 1275 },
1276 { 1276 {
@@ -1278,7 +1278,7 @@ ctl_table random_table[] = {
1278 .data = &random_read_wakeup_thresh, 1278 .data = &random_read_wakeup_thresh,
1279 .maxlen = sizeof(int), 1279 .maxlen = sizeof(int),
1280 .mode = 0644, 1280 .mode = 0644,
1281 .proc_handler = &proc_dointvec_minmax, 1281 .proc_handler = proc_dointvec_minmax,
1282 .extra1 = &min_read_thresh, 1282 .extra1 = &min_read_thresh,
1283 .extra2 = &max_read_thresh, 1283 .extra2 = &max_read_thresh,
1284 }, 1284 },
@@ -1287,7 +1287,7 @@ ctl_table random_table[] = {
1287 .data = &random_write_wakeup_thresh, 1287 .data = &random_write_wakeup_thresh,
1288 .maxlen = sizeof(int), 1288 .maxlen = sizeof(int),
1289 .mode = 0644, 1289 .mode = 0644,
1290 .proc_handler = &proc_dointvec_minmax, 1290 .proc_handler = proc_dointvec_minmax,
1291 .extra1 = &min_write_thresh, 1291 .extra1 = &min_write_thresh,
1292 .extra2 = &max_write_thresh, 1292 .extra2 = &max_write_thresh,
1293 }, 1293 },
@@ -1296,13 +1296,13 @@ ctl_table random_table[] = {
1296 .data = &sysctl_bootid, 1296 .data = &sysctl_bootid,
1297 .maxlen = 16, 1297 .maxlen = 16,
1298 .mode = 0444, 1298 .mode = 0444,
1299 .proc_handler = &proc_do_uuid, 1299 .proc_handler = proc_do_uuid,
1300 }, 1300 },
1301 { 1301 {
1302 .procname = "uuid", 1302 .procname = "uuid",
1303 .maxlen = 16, 1303 .maxlen = 16,
1304 .mode = 0444, 1304 .mode = 0444,
1305 .proc_handler = &proc_do_uuid, 1305 .proc_handler = proc_do_uuid,
1306 }, 1306 },
1307 { } 1307 { }
1308}; 1308};
diff --git a/drivers/char/rtc.c b/drivers/char/rtc.c
index 37bfe23c218e..95acb8c880f4 100644
--- a/drivers/char/rtc.c
+++ b/drivers/char/rtc.c
@@ -286,7 +286,7 @@ static ctl_table rtc_table[] = {
286 .data = &rtc_max_user_freq, 286 .data = &rtc_max_user_freq,
287 .maxlen = sizeof(int), 287 .maxlen = sizeof(int),
288 .mode = 0644, 288 .mode = 0644,
289 .proc_handler = &proc_dointvec, 289 .proc_handler = proc_dointvec,
290 }, 290 },
291 { } 291 { }
292}; 292};
diff --git a/drivers/macintosh/mac_hid.c b/drivers/macintosh/mac_hid.c
index 2dd29b42a49e..7b4ef5bb556b 100644
--- a/drivers/macintosh/mac_hid.c
+++ b/drivers/macintosh/mac_hid.c
@@ -31,21 +31,21 @@ static ctl_table mac_hid_files[] = {
31 .data = &mouse_emulate_buttons, 31 .data = &mouse_emulate_buttons,
32 .maxlen = sizeof(int), 32 .maxlen = sizeof(int),
33 .mode = 0644, 33 .mode = 0644,
34 .proc_handler = &proc_dointvec, 34 .proc_handler = proc_dointvec,
35 }, 35 },
36 { 36 {
37 .procname = "mouse_button2_keycode", 37 .procname = "mouse_button2_keycode",
38 .data = &mouse_button2_keycode, 38 .data = &mouse_button2_keycode,
39 .maxlen = sizeof(int), 39 .maxlen = sizeof(int),
40 .mode = 0644, 40 .mode = 0644,
41 .proc_handler = &proc_dointvec, 41 .proc_handler = proc_dointvec,
42 }, 42 },
43 { 43 {
44 .procname = "mouse_button3_keycode", 44 .procname = "mouse_button3_keycode",
45 .data = &mouse_button3_keycode, 45 .data = &mouse_button3_keycode,
46 .maxlen = sizeof(int), 46 .maxlen = sizeof(int),
47 .mode = 0644, 47 .mode = 0644,
48 .proc_handler = &proc_dointvec, 48 .proc_handler = proc_dointvec,
49 }, 49 },
50 { } 50 { }
51}; 51};
diff --git a/drivers/md/md.c b/drivers/md/md.c
index 1d529551e944..1d7b9a23c765 100644
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -102,14 +102,14 @@ static ctl_table raid_table[] = {
102 .data = &sysctl_speed_limit_min, 102 .data = &sysctl_speed_limit_min,
103 .maxlen = sizeof(int), 103 .maxlen = sizeof(int),
104 .mode = S_IRUGO|S_IWUSR, 104 .mode = S_IRUGO|S_IWUSR,
105 .proc_handler = &proc_dointvec, 105 .proc_handler = proc_dointvec,
106 }, 106 },
107 { 107 {
108 .procname = "speed_limit_max", 108 .procname = "speed_limit_max",
109 .data = &sysctl_speed_limit_max, 109 .data = &sysctl_speed_limit_max,
110 .maxlen = sizeof(int), 110 .maxlen = sizeof(int),
111 .mode = S_IRUGO|S_IWUSR, 111 .mode = S_IRUGO|S_IWUSR,
112 .proc_handler = &proc_dointvec, 112 .proc_handler = proc_dointvec,
113 }, 113 },
114 { } 114 { }
115}; 115};
diff --git a/drivers/misc/sgi-xp/xpc_main.c b/drivers/misc/sgi-xp/xpc_main.c
index ce98b9373be7..832ed4c88cf7 100644
--- a/drivers/misc/sgi-xp/xpc_main.c
+++ b/drivers/misc/sgi-xp/xpc_main.c
@@ -93,7 +93,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = {
93 .data = &xpc_hb_interval, 93 .data = &xpc_hb_interval,
94 .maxlen = sizeof(int), 94 .maxlen = sizeof(int),
95 .mode = 0644, 95 .mode = 0644,
96 .proc_handler = &proc_dointvec_minmax, 96 .proc_handler = proc_dointvec_minmax,
97 .extra1 = &xpc_hb_min_interval, 97 .extra1 = &xpc_hb_min_interval,
98 .extra2 = &xpc_hb_max_interval}, 98 .extra2 = &xpc_hb_max_interval},
99 { 99 {
@@ -101,7 +101,7 @@ static ctl_table xpc_sys_xpc_hb_dir[] = {
101 .data = &xpc_hb_check_interval, 101 .data = &xpc_hb_check_interval,
102 .maxlen = sizeof(int), 102 .maxlen = sizeof(int),
103 .mode = 0644, 103 .mode = 0644,
104 .proc_handler = &proc_dointvec_minmax, 104 .proc_handler = proc_dointvec_minmax,
105 .extra1 = &xpc_hb_check_min_interval, 105 .extra1 = &xpc_hb_check_min_interval,
106 .extra2 = &xpc_hb_check_max_interval}, 106 .extra2 = &xpc_hb_check_max_interval},
107 {} 107 {}
@@ -116,7 +116,7 @@ static ctl_table xpc_sys_xpc_dir[] = {
116 .data = &xpc_disengage_timelimit, 116 .data = &xpc_disengage_timelimit,
117 .maxlen = sizeof(int), 117 .maxlen = sizeof(int),
118 .mode = 0644, 118 .mode = 0644,
119 .proc_handler = &proc_dointvec_minmax, 119 .proc_handler = proc_dointvec_minmax,
120 .extra1 = &xpc_disengage_min_timelimit, 120 .extra1 = &xpc_disengage_min_timelimit,
121 .extra2 = &xpc_disengage_max_timelimit}, 121 .extra2 = &xpc_disengage_max_timelimit},
122 {} 122 {}
diff --git a/drivers/net/wireless/arlan-proc.c b/drivers/net/wireless/arlan-proc.c
index 66a0b330b756..b22983e6c0cf 100644
--- a/drivers/net/wireless/arlan-proc.c
+++ b/drivers/net/wireless/arlan-proc.c
@@ -819,15 +819,15 @@ static int arlan_sysctl_reset(ctl_table * ctl, int write,
819#define CTBLN(card,nam) \ 819#define CTBLN(card,nam) \
820 { .procname = #nam,\ 820 { .procname = #nam,\
821 .data = &(arlan_conf[card].nam),\ 821 .data = &(arlan_conf[card].nam),\
822 .maxlen = sizeof(int), .mode = 0600, .proc_handler = &proc_dointvec} 822 .maxlen = sizeof(int), .mode = 0600, .proc_handler = proc_dointvec}
823#ifdef ARLAN_DEBUGGING 823#ifdef ARLAN_DEBUGGING
824 824
825#define ARLAN_PROC_DEBUG_ENTRIES \ 825#define ARLAN_PROC_DEBUG_ENTRIES \
826 { .procname = "entry_exit_debug",\ 826 { .procname = "entry_exit_debug",\
827 .data = &arlan_entry_and_exit_debug,\ 827 .data = &arlan_entry_and_exit_debug,\
828 .maxlen = sizeof(int), .mode = 0600, .proc_handler = &proc_dointvec},\ 828 .maxlen = sizeof(int), .mode = 0600, .proc_handler = proc_dointvec},\
829 { .procname = "debug", .data = &arlan_debug,\ 829 { .procname = "debug", .data = &arlan_debug,\
830 .maxlen = sizeof(int), .mode = 0600, .proc_handler = &proc_dointvec}, 830 .maxlen = sizeof(int), .mode = 0600, .proc_handler = proc_dointvec},
831#else 831#else
832#define ARLAN_PROC_DEBUG_ENTRIES 832#define ARLAN_PROC_DEBUG_ENTRIES
833#endif 833#endif
@@ -864,7 +864,7 @@ static int arlan_sysctl_reset(ctl_table * ctl, int write,
864 CTBLN(cardNo, channelSet), \ 864 CTBLN(cardNo, channelSet), \
865 { .procname = "name",\ 865 { .procname = "name",\
866 .data = arlan_conf[cardNo].siteName,\ 866 .data = arlan_conf[cardNo].siteName,\
867 .maxlen = 16, .mode = 0600, .proc_handler = &proc_dostring},\ 867 .maxlen = 16, .mode = 0600, .proc_handler = proc_dostring},\
868 CTBLN(cardNo,waitTime),\ 868 CTBLN(cardNo,waitTime),\
869 CTBLN(cardNo,lParameter),\ 869 CTBLN(cardNo,lParameter),\
870 CTBLN(cardNo,_15),\ 870 CTBLN(cardNo,_15),\
@@ -906,35 +906,35 @@ static ctl_table arlan_conf_table0[] =
906 .data = &arlan_drive_info, 906 .data = &arlan_drive_info,
907 .maxlen = ARLAN_STR_SIZE, 907 .maxlen = ARLAN_STR_SIZE,
908 .mode = 0400, 908 .mode = 0400,
909 .proc_handler = &arlan_sysctl_infotxRing, 909 .proc_handler = arlan_sysctl_infotxRing,
910 }, 910 },
911 { 911 {
912 .procname = "arlan0-rxRing", 912 .procname = "arlan0-rxRing",
913 .data = &arlan_drive_info, 913 .data = &arlan_drive_info,
914 .maxlen = ARLAN_STR_SIZE, 914 .maxlen = ARLAN_STR_SIZE,
915 .mode = 0400, 915 .mode = 0400,
916 .proc_handler = &arlan_sysctl_inforxRing, 916 .proc_handler = arlan_sysctl_inforxRing,
917 }, 917 },
918 { 918 {
919 .procname = "arlan0-18", 919 .procname = "arlan0-18",
920 .data = &arlan_drive_info, 920 .data = &arlan_drive_info,
921 .maxlen = ARLAN_STR_SIZE, 921 .maxlen = ARLAN_STR_SIZE,
922 .mode = 0400, 922 .mode = 0400,
923 .proc_handler = &arlan_sysctl_info18, 923 .proc_handler = arlan_sysctl_info18,
924 }, 924 },
925 { 925 {
926 .procname = "arlan0-ring", 926 .procname = "arlan0-ring",
927 .data = &arlan_drive_info, 927 .data = &arlan_drive_info,
928 .maxlen = ARLAN_STR_SIZE, 928 .maxlen = ARLAN_STR_SIZE,
929 .mode = 0400, 929 .mode = 0400,
930 .proc_handler = &arlan_sysctl_info161719, 930 .proc_handler = arlan_sysctl_info161719,
931 }, 931 },
932 { 932 {
933 .procname = "arlan0-shm-cpy", 933 .procname = "arlan0-shm-cpy",
934 .data = &arlan_drive_info, 934 .data = &arlan_drive_info,
935 .maxlen = ARLAN_STR_SIZE, 935 .maxlen = ARLAN_STR_SIZE,
936 .mode = 0400, 936 .mode = 0400,
937 .proc_handler = &arlan_sysctl_info, 937 .proc_handler = arlan_sysctl_info,
938 }, 938 },
939#endif 939#endif
940 { 940 {
@@ -942,14 +942,14 @@ static ctl_table arlan_conf_table0[] =
942 .data = &conf_reset_result, 942 .data = &conf_reset_result,
943 .maxlen = 100, 943 .maxlen = 100,
944 .mode = 0400, 944 .mode = 0400,
945 .proc_handler = &arlan_configure 945 .proc_handler = arlan_configure
946 }, 946 },
947 { 947 {
948 .procname = "reset0", 948 .procname = "reset0",
949 .data = &conf_reset_result, 949 .data = &conf_reset_result,
950 .maxlen = 100, 950 .maxlen = 100,
951 .mode = 0400, 951 .mode = 0400,
952 .proc_handler = &arlan_sysctl_reset, 952 .proc_handler = arlan_sysctl_reset,
953 }, 953 },
954 { } 954 { }
955}; 955};
@@ -965,35 +965,35 @@ static ctl_table arlan_conf_table1[] =
965 .data = &arlan_drive_info, 965 .data = &arlan_drive_info,
966 .maxlen = ARLAN_STR_SIZE, 966 .maxlen = ARLAN_STR_SIZE,
967 .mode = 0400, 967 .mode = 0400,
968 .proc_handler = &arlan_sysctl_infotxRing, 968 .proc_handler = arlan_sysctl_infotxRing,
969 }, 969 },
970 { 970 {
971 .procname = "arlan1-rxRing", 971 .procname = "arlan1-rxRing",
972 .data = &arlan_drive_info, 972 .data = &arlan_drive_info,
973 .maxlen = ARLAN_STR_SIZE, 973 .maxlen = ARLAN_STR_SIZE,
974 .mode = 0400, 974 .mode = 0400,
975 .proc_handler = &arlan_sysctl_inforxRing, 975 .proc_handler = arlan_sysctl_inforxRing,
976 }, 976 },
977 { 977 {
978 .procname = "arlan1-18", 978 .procname = "arlan1-18",
979 .data = &arlan_drive_info, 979 .data = &arlan_drive_info,
980 .maxlen = ARLAN_STR_SIZE, 980 .maxlen = ARLAN_STR_SIZE,
981 .mode = 0400, 981 .mode = 0400,
982 .proc_handler = &arlan_sysctl_info18, 982 .proc_handler = arlan_sysctl_info18,
983 }, 983 },
984 { 984 {
985 .procname = "arlan1-ring", 985 .procname = "arlan1-ring",
986 .data = &arlan_drive_info, 986 .data = &arlan_drive_info,
987 .maxlen = ARLAN_STR_SIZE, 987 .maxlen = ARLAN_STR_SIZE,
988 .mode = 0400, 988 .mode = 0400,
989 .proc_handler = &arlan_sysctl_info161719, 989 .proc_handler = arlan_sysctl_info161719,
990 }, 990 },
991 { 991 {
992 .procname = "arlan1-shm-cpy", 992 .procname = "arlan1-shm-cpy",
993 .data = &arlan_drive_info, 993 .data = &arlan_drive_info,
994 .maxlen = ARLAN_STR_SIZE, 994 .maxlen = ARLAN_STR_SIZE,
995 .mode = 0400, 995 .mode = 0400,
996 .proc_handler = &arlan_sysctl_info, 996 .proc_handler = arlan_sysctl_info,
997 }, 997 },
998#endif 998#endif
999 { 999 {
@@ -1001,14 +1001,14 @@ static ctl_table arlan_conf_table1[] =
1001 .data = &conf_reset_result, 1001 .data = &conf_reset_result,
1002 .maxlen = 100, 1002 .maxlen = 100,
1003 .mode = 0400, 1003 .mode = 0400,
1004 .proc_handler = &arlan_configure, 1004 .proc_handler = arlan_configure,
1005 }, 1005 },
1006 { 1006 {
1007 .procname = "reset1", 1007 .procname = "reset1",
1008 .data = &conf_reset_result, 1008 .data = &conf_reset_result,
1009 .maxlen = 100, 1009 .maxlen = 100,
1010 .mode = 0400, 1010 .mode = 0400,
1011 .proc_handler = &arlan_sysctl_reset, 1011 .proc_handler = arlan_sysctl_reset,
1012 }, 1012 },
1013 { } 1013 { }
1014}; 1014};
@@ -1024,35 +1024,35 @@ static ctl_table arlan_conf_table2[] =
1024 .data = &arlan_drive_info, 1024 .data = &arlan_drive_info,
1025 .maxlen = ARLAN_STR_SIZE, 1025 .maxlen = ARLAN_STR_SIZE,
1026 .mode = 0400, 1026 .mode = 0400,
1027 .proc_handler = &arlan_sysctl_infotxRing, 1027 .proc_handler = arlan_sysctl_infotxRing,
1028 }, 1028 },
1029 { 1029 {
1030 .procname = "arlan2-rxRing", 1030 .procname = "arlan2-rxRing",
1031 .data = &arlan_drive_info, 1031 .data = &arlan_drive_info,
1032 .maxlen = ARLAN_STR_SIZE, 1032 .maxlen = ARLAN_STR_SIZE,
1033 .mode = 0400, 1033 .mode = 0400,
1034 .proc_handler = &arlan_sysctl_inforxRing, 1034 .proc_handler = arlan_sysctl_inforxRing,
1035 }, 1035 },
1036 { 1036 {
1037 .procname = "arlan2-18", 1037 .procname = "arlan2-18",
1038 .data = &arlan_drive_info, 1038 .data = &arlan_drive_info,
1039 .maxlen = ARLAN_STR_SIZE, 1039 .maxlen = ARLAN_STR_SIZE,
1040 .mode = 0400, 1040 .mode = 0400,
1041 .proc_handler = &arlan_sysctl_info18, 1041 .proc_handler = arlan_sysctl_info18,
1042 }, 1042 },
1043 { 1043 {
1044 .procname = "arlan2-ring", 1044 .procname = "arlan2-ring",
1045 .data = &arlan_drive_info, 1045 .data = &arlan_drive_info,
1046 .maxlen = ARLAN_STR_SIZE, 1046 .maxlen = ARLAN_STR_SIZE,
1047 .mode = 0400, 1047 .mode = 0400,
1048 .proc_handler = &arlan_sysctl_info161719, 1048 .proc_handler = arlan_sysctl_info161719,
1049 }, 1049 },
1050 { 1050 {
1051 .procname = "arlan2-shm-cpy", 1051 .procname = "arlan2-shm-cpy",
1052 .data = &arlan_drive_info, 1052 .data = &arlan_drive_info,
1053 .maxlen = ARLAN_STR_SIZE, 1053 .maxlen = ARLAN_STR_SIZE,
1054 .mode = 0400, 1054 .mode = 0400,
1055 .proc_handler = &arlan_sysctl_info, 1055 .proc_handler = arlan_sysctl_info,
1056 }, 1056 },
1057#endif 1057#endif
1058 { 1058 {
@@ -1060,14 +1060,14 @@ static ctl_table arlan_conf_table2[] =
1060 .data = &conf_reset_result, 1060 .data = &conf_reset_result,
1061 .maxlen = 100, 1061 .maxlen = 100,
1062 .mode = 0400, 1062 .mode = 0400,
1063 .proc_handler = &arlan_configure, 1063 .proc_handler = arlan_configure,
1064 }, 1064 },
1065 { 1065 {
1066 .procname = "reset2", 1066 .procname = "reset2",
1067 .data = &conf_reset_result, 1067 .data = &conf_reset_result,
1068 .maxlen = 100, 1068 .maxlen = 100,
1069 .mode = 0400, 1069 .mode = 0400,
1070 .proc_handler = &arlan_sysctl_reset, 1070 .proc_handler = arlan_sysctl_reset,
1071 }, 1071 },
1072 { } 1072 { }
1073}; 1073};
@@ -1083,35 +1083,35 @@ static ctl_table arlan_conf_table3[] =
1083 .data = &arlan_drive_info, 1083 .data = &arlan_drive_info,
1084 .maxlen = ARLAN_STR_SIZE, 1084 .maxlen = ARLAN_STR_SIZE,
1085 .mode = 0400, 1085 .mode = 0400,
1086 .proc_handler = &arlan_sysctl_infotxRing, 1086 .proc_handler = arlan_sysctl_infotxRing,
1087 }, 1087 },
1088 { 1088 {
1089 .procname = "arlan3-rxRing", 1089 .procname = "arlan3-rxRing",
1090 .data = &arlan_drive_info, 1090 .data = &arlan_drive_info,
1091 .maxlen = ARLAN_STR_SIZE, 1091 .maxlen = ARLAN_STR_SIZE,
1092 .mode = 0400, 1092 .mode = 0400,
1093 .proc_handler = &arlan_sysctl_inforxRing, 1093 .proc_handler = arlan_sysctl_inforxRing,
1094 }, 1094 },
1095 { 1095 {
1096 .procname = "arlan3-18", 1096 .procname = "arlan3-18",
1097 .data = &arlan_drive_info, 1097 .data = &arlan_drive_info,
1098 .maxlen = ARLAN_STR_SIZE, 1098 .maxlen = ARLAN_STR_SIZE,
1099 .mode = 0400, 1099 .mode = 0400,
1100 .proc_handler = &arlan_sysctl_info18, 1100 .proc_handler = arlan_sysctl_info18,
1101 }, 1101 },
1102 { 1102 {
1103 .procname = "arlan3-ring", 1103 .procname = "arlan3-ring",
1104 .data = &arlan_drive_info, 1104 .data = &arlan_drive_info,
1105 .maxlen = ARLAN_STR_SIZE, 1105 .maxlen = ARLAN_STR_SIZE,
1106 .mode = 0400, 1106 .mode = 0400,
1107 .proc_handler = &arlan_sysctl_info161719, 1107 .proc_handler = arlan_sysctl_info161719,
1108 }, 1108 },
1109 { 1109 {
1110 .procname = "arlan3-shm-cpy", 1110 .procname = "arlan3-shm-cpy",
1111 .data = &arlan_drive_info, 1111 .data = &arlan_drive_info,
1112 .maxlen = ARLAN_STR_SIZE, 1112 .maxlen = ARLAN_STR_SIZE,
1113 .mode = 0400, 1113 .mode = 0400,
1114 .proc_handler = &arlan_sysctl_info, 1114 .proc_handler = arlan_sysctl_info,
1115 }, 1115 },
1116#endif 1116#endif
1117 { 1117 {
@@ -1119,14 +1119,14 @@ static ctl_table arlan_conf_table3[] =
1119 .data = &conf_reset_result, 1119 .data = &conf_reset_result,
1120 .maxlen = 100, 1120 .maxlen = 100,
1121 .mode = 0400, 1121 .mode = 0400,
1122 .proc_handler = &arlan_configure, 1122 .proc_handler = arlan_configure,
1123 }, 1123 },
1124 { 1124 {
1125 .procname = "reset3", 1125 .procname = "reset3",
1126 .data = &conf_reset_result, 1126 .data = &conf_reset_result,
1127 .maxlen = 100, 1127 .maxlen = 100,
1128 .mode = 0400, 1128 .mode = 0400,
1129 .proc_handler = &arlan_sysctl_reset, 1129 .proc_handler = arlan_sysctl_reset,
1130 }, 1130 },
1131 { } 1131 { }
1132}; 1132};
diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c
index f808bdbf1772..3f56bc086cb5 100644
--- a/drivers/parport/procfs.c
+++ b/drivers/parport/procfs.c
@@ -270,7 +270,7 @@ static const struct parport_sysctl_table parport_sysctl_template = {
270 .data = NULL, 270 .data = NULL,
271 .maxlen = sizeof(int), 271 .maxlen = sizeof(int),
272 .mode = 0644, 272 .mode = 0644,
273 .proc_handler = &proc_dointvec_minmax, 273 .proc_handler = proc_dointvec_minmax,
274 .extra1 = (void*) &parport_min_spintime_value, 274 .extra1 = (void*) &parport_min_spintime_value,
275 .extra2 = (void*) &parport_max_spintime_value 275 .extra2 = (void*) &parport_max_spintime_value
276 }, 276 },
@@ -279,28 +279,28 @@ static const struct parport_sysctl_table parport_sysctl_template = {
279 .data = NULL, 279 .data = NULL,
280 .maxlen = 0, 280 .maxlen = 0,
281 .mode = 0444, 281 .mode = 0444,
282 .proc_handler = &do_hardware_base_addr 282 .proc_handler = do_hardware_base_addr
283 }, 283 },
284 { 284 {
285 .procname = "irq", 285 .procname = "irq",
286 .data = NULL, 286 .data = NULL,
287 .maxlen = 0, 287 .maxlen = 0,
288 .mode = 0444, 288 .mode = 0444,
289 .proc_handler = &do_hardware_irq 289 .proc_handler = do_hardware_irq
290 }, 290 },
291 { 291 {
292 .procname = "dma", 292 .procname = "dma",
293 .data = NULL, 293 .data = NULL,
294 .maxlen = 0, 294 .maxlen = 0,
295 .mode = 0444, 295 .mode = 0444,
296 .proc_handler = &do_hardware_dma 296 .proc_handler = do_hardware_dma
297 }, 297 },
298 { 298 {
299 .procname = "modes", 299 .procname = "modes",
300 .data = NULL, 300 .data = NULL,
301 .maxlen = 0, 301 .maxlen = 0,
302 .mode = 0444, 302 .mode = 0444,
303 .proc_handler = &do_hardware_modes 303 .proc_handler = do_hardware_modes
304 }, 304 },
305 PARPORT_DEVICES_ROOT_DIR, 305 PARPORT_DEVICES_ROOT_DIR,
306#ifdef CONFIG_PARPORT_1284 306#ifdef CONFIG_PARPORT_1284
@@ -309,35 +309,35 @@ static const struct parport_sysctl_table parport_sysctl_template = {
309 .data = NULL, 309 .data = NULL,
310 .maxlen = 0, 310 .maxlen = 0,
311 .mode = 0444, 311 .mode = 0444,
312 .proc_handler = &do_autoprobe 312 .proc_handler = do_autoprobe
313 }, 313 },
314 { 314 {
315 .procname = "autoprobe0", 315 .procname = "autoprobe0",
316 .data = NULL, 316 .data = NULL,
317 .maxlen = 0, 317 .maxlen = 0,
318 .mode = 0444, 318 .mode = 0444,
319 .proc_handler = &do_autoprobe 319 .proc_handler = do_autoprobe
320 }, 320 },
321 { 321 {
322 .procname = "autoprobe1", 322 .procname = "autoprobe1",
323 .data = NULL, 323 .data = NULL,
324 .maxlen = 0, 324 .maxlen = 0,
325 .mode = 0444, 325 .mode = 0444,
326 .proc_handler = &do_autoprobe 326 .proc_handler = do_autoprobe
327 }, 327 },
328 { 328 {
329 .procname = "autoprobe2", 329 .procname = "autoprobe2",
330 .data = NULL, 330 .data = NULL,
331 .maxlen = 0, 331 .maxlen = 0,
332 .mode = 0444, 332 .mode = 0444,
333 .proc_handler = &do_autoprobe 333 .proc_handler = do_autoprobe
334 }, 334 },
335 { 335 {
336 .procname = "autoprobe3", 336 .procname = "autoprobe3",
337 .data = NULL, 337 .data = NULL,
338 .maxlen = 0, 338 .maxlen = 0,
339 .mode = 0444, 339 .mode = 0444,
340 .proc_handler = &do_autoprobe 340 .proc_handler = do_autoprobe
341 }, 341 },
342#endif /* IEEE 1284 support */ 342#endif /* IEEE 1284 support */
343 {} 343 {}
@@ -348,7 +348,7 @@ static const struct parport_sysctl_table parport_sysctl_template = {
348 .data = NULL, 348 .data = NULL,
349 .maxlen = 0, 349 .maxlen = 0,
350 .mode = 0444, 350 .mode = 0444,
351 .proc_handler = &do_active_device 351 .proc_handler = do_active_device
352 }, 352 },
353 {} 353 {}
354 }, 354 },
@@ -386,7 +386,7 @@ parport_device_sysctl_template = {
386 .data = NULL, 386 .data = NULL,
387 .maxlen = sizeof(unsigned long), 387 .maxlen = sizeof(unsigned long),
388 .mode = 0644, 388 .mode = 0644,
389 .proc_handler = &proc_doulongvec_ms_jiffies_minmax, 389 .proc_handler = proc_doulongvec_ms_jiffies_minmax,
390 .extra1 = (void*) &parport_min_timeslice_value, 390 .extra1 = (void*) &parport_min_timeslice_value,
391 .extra2 = (void*) &parport_max_timeslice_value 391 .extra2 = (void*) &parport_max_timeslice_value
392 }, 392 },
@@ -437,7 +437,7 @@ parport_default_sysctl_table = {
437 .data = &parport_default_timeslice, 437 .data = &parport_default_timeslice,
438 .maxlen = sizeof(parport_default_timeslice), 438 .maxlen = sizeof(parport_default_timeslice),
439 .mode = 0644, 439 .mode = 0644,
440 .proc_handler = &proc_doulongvec_ms_jiffies_minmax, 440 .proc_handler = proc_doulongvec_ms_jiffies_minmax,
441 .extra1 = (void*) &parport_min_timeslice_value, 441 .extra1 = (void*) &parport_min_timeslice_value,
442 .extra2 = (void*) &parport_max_timeslice_value 442 .extra2 = (void*) &parport_max_timeslice_value
443 }, 443 },
@@ -446,7 +446,7 @@ parport_default_sysctl_table = {
446 .data = &parport_default_spintime, 446 .data = &parport_default_spintime,
447 .maxlen = sizeof(parport_default_spintime), 447 .maxlen = sizeof(parport_default_spintime),
448 .mode = 0644, 448 .mode = 0644,
449 .proc_handler = &proc_dointvec_minmax, 449 .proc_handler = proc_dointvec_minmax,
450 .extra1 = (void*) &parport_min_spintime_value, 450 .extra1 = (void*) &parport_min_spintime_value,
451 .extra2 = (void*) &parport_max_spintime_value 451 .extra2 = (void*) &parport_max_spintime_value
452 }, 452 },
diff --git a/drivers/scsi/scsi_sysctl.c b/drivers/scsi/scsi_sysctl.c
index 42c31bee7113..2b6b93f7d8ef 100644
--- a/drivers/scsi/scsi_sysctl.c
+++ b/drivers/scsi/scsi_sysctl.c
@@ -17,7 +17,7 @@ static ctl_table scsi_table[] = {
17 .data = &scsi_logging_level, 17 .data = &scsi_logging_level,
18 .maxlen = sizeof(scsi_logging_level), 18 .maxlen = sizeof(scsi_logging_level),
19 .mode = 0644, 19 .mode = 0644,
20 .proc_handler = &proc_dointvec }, 20 .proc_handler = proc_dointvec },
21 { } 21 { }
22}; 22};
23 23
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-28 09:23:13 -0500