aboutsummaryrefslogtreecommitdiffstats
path: root/net/irda
diff options
context:
space:
mode:
authorAlexey Dobriyan <adobriyan@gmail.com>2008-11-03 21:21:05 -0500
committerDavid S. Miller <davem@davemloft.net>2008-11-03 21:21:05 -0500
commit6d9f239a1edb31d6133230f478fd1dc2da338ec5 (patch)
tree305fa0da95a49db4e342f3f3042f8be0968b03ce /net/irda
parent6cf3f41e6c08bca6641a695449791c38a25f35ff (diff)
net: '&' redux
I want to compile out proc_* and sysctl_* handlers totally and stub them to NULL depending on config options, however usage of & will prevent this, since taking adress of NULL pointer will break compilation. So, drop & in front of every ->proc_handler and every ->strategy handler, it was never needed in fact. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda')
-rw-r--r--net/irda/irsysctl.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/net/irda/irsysctl.c b/net/irda/irsysctl.c
index 9ab3df15425d..57f8817c3979 100644
--- a/net/irda/irsysctl.c
+++ b/net/irda/irsysctl.c
@@ -118,8 +118,8 @@ static ctl_table irda_table[] = {
118 .data = &sysctl_discovery, 118 .data = &sysctl_discovery,
119 .maxlen = sizeof(int), 119 .maxlen = sizeof(int),
120 .mode = 0644, 120 .mode = 0644,
121 .proc_handler = &do_discovery, 121 .proc_handler = do_discovery,
122 .strategy = &sysctl_intvec 122 .strategy = sysctl_intvec
123 }, 123 },
124 { 124 {
125 .ctl_name = NET_IRDA_DEVNAME, 125 .ctl_name = NET_IRDA_DEVNAME,
@@ -127,8 +127,8 @@ static ctl_table irda_table[] = {
127 .data = sysctl_devname, 127 .data = sysctl_devname,
128 .maxlen = 65, 128 .maxlen = 65,
129 .mode = 0644, 129 .mode = 0644,
130 .proc_handler = &do_devname, 130 .proc_handler = do_devname,
131 .strategy = &sysctl_string 131 .strategy = sysctl_string
132 }, 132 },
133#ifdef CONFIG_IRDA_DEBUG 133#ifdef CONFIG_IRDA_DEBUG
134 { 134 {
@@ -137,7 +137,7 @@ static ctl_table irda_table[] = {
137 .data = &irda_debug, 137 .data = &irda_debug,
138 .maxlen = sizeof(int), 138 .maxlen = sizeof(int),
139 .mode = 0644, 139 .mode = 0644,
140 .proc_handler = &proc_dointvec 140 .proc_handler = proc_dointvec
141 }, 141 },
142#endif 142#endif
143#ifdef CONFIG_IRDA_FAST_RR 143#ifdef CONFIG_IRDA_FAST_RR
@@ -147,7 +147,7 @@ static ctl_table irda_table[] = {
147 .data = &sysctl_fast_poll_increase, 147 .data = &sysctl_fast_poll_increase,
148 .maxlen = sizeof(int), 148 .maxlen = sizeof(int),
149 .mode = 0644, 149 .mode = 0644,
150 .proc_handler = &proc_dointvec 150 .proc_handler = proc_dointvec
151 }, 151 },
152#endif 152#endif
153 { 153 {
@@ -156,8 +156,8 @@ static ctl_table irda_table[] = {
156 .data = &sysctl_discovery_slots, 156 .data = &sysctl_discovery_slots,
157 .maxlen = sizeof(int), 157 .maxlen = sizeof(int),
158 .mode = 0644, 158 .mode = 0644,
159 .proc_handler = &proc_dointvec_minmax, 159 .proc_handler = proc_dointvec_minmax,
160 .strategy = &sysctl_intvec, 160 .strategy = sysctl_intvec,
161 .extra1 = &min_discovery_slots, 161 .extra1 = &min_discovery_slots,
162 .extra2 = &max_discovery_slots 162 .extra2 = &max_discovery_slots
163 }, 163 },
@@ -167,7 +167,7 @@ static ctl_table irda_table[] = {
167 .data = &sysctl_discovery_timeout, 167 .data = &sysctl_discovery_timeout,
168 .maxlen = sizeof(int), 168 .maxlen = sizeof(int),
169 .mode = 0644, 169 .mode = 0644,
170 .proc_handler = &proc_dointvec 170 .proc_handler = proc_dointvec
171 }, 171 },
172 { 172 {
173 .ctl_name = NET_IRDA_SLOT_TIMEOUT, 173 .ctl_name = NET_IRDA_SLOT_TIMEOUT,
@@ -175,8 +175,8 @@ static ctl_table irda_table[] = {
175 .data = &sysctl_slot_timeout, 175 .data = &sysctl_slot_timeout,
176 .maxlen = sizeof(int), 176 .maxlen = sizeof(int),
177 .mode = 0644, 177 .mode = 0644,
178 .proc_handler = &proc_dointvec_minmax, 178 .proc_handler = proc_dointvec_minmax,
179 .strategy = &sysctl_intvec, 179 .strategy = sysctl_intvec,
180 .extra1 = &min_slot_timeout, 180 .extra1 = &min_slot_timeout,
181 .extra2 = &max_slot_timeout 181 .extra2 = &max_slot_timeout
182 }, 182 },
@@ -186,8 +186,8 @@ static ctl_table irda_table[] = {
186 .data = &sysctl_max_baud_rate, 186 .data = &sysctl_max_baud_rate,
187 .maxlen = sizeof(int), 187 .maxlen = sizeof(int),
188 .mode = 0644, 188 .mode = 0644,
189 .proc_handler = &proc_dointvec_minmax, 189 .proc_handler = proc_dointvec_minmax,
190 .strategy = &sysctl_intvec, 190 .strategy = sysctl_intvec,
191 .extra1 = &min_max_baud_rate, 191 .extra1 = &min_max_baud_rate,
192 .extra2 = &max_max_baud_rate 192 .extra2 = &max_max_baud_rate
193 }, 193 },
@@ -197,8 +197,8 @@ static ctl_table irda_table[] = {
197 .data = &sysctl_min_tx_turn_time, 197 .data = &sysctl_min_tx_turn_time,
198 .maxlen = sizeof(int), 198 .maxlen = sizeof(int),
199 .mode = 0644, 199 .mode = 0644,
200 .proc_handler = &proc_dointvec_minmax, 200 .proc_handler = proc_dointvec_minmax,
201 .strategy = &sysctl_intvec, 201 .strategy = sysctl_intvec,
202 .extra1 = &min_min_tx_turn_time, 202 .extra1 = &min_min_tx_turn_time,
203 .extra2 = &max_min_tx_turn_time 203 .extra2 = &max_min_tx_turn_time
204 }, 204 },
@@ -208,8 +208,8 @@ static ctl_table irda_table[] = {
208 .data = &sysctl_max_tx_data_size, 208 .data = &sysctl_max_tx_data_size,
209 .maxlen = sizeof(int), 209 .maxlen = sizeof(int),
210 .mode = 0644, 210 .mode = 0644,
211 .proc_handler = &proc_dointvec_minmax, 211 .proc_handler = proc_dointvec_minmax,
212 .strategy = &sysctl_intvec, 212 .strategy = sysctl_intvec,
213 .extra1 = &min_max_tx_data_size, 213 .extra1 = &min_max_tx_data_size,
214 .extra2 = &max_max_tx_data_size 214 .extra2 = &max_max_tx_data_size
215 }, 215 },
@@ -219,8 +219,8 @@ static ctl_table irda_table[] = {
219 .data = &sysctl_max_tx_window, 219 .data = &sysctl_max_tx_window,
220 .maxlen = sizeof(int), 220 .maxlen = sizeof(int),
221 .mode = 0644, 221 .mode = 0644,
222 .proc_handler = &proc_dointvec_minmax, 222 .proc_handler = proc_dointvec_minmax,
223 .strategy = &sysctl_intvec, 223 .strategy = sysctl_intvec,
224 .extra1 = &min_max_tx_window, 224 .extra1 = &min_max_tx_window,
225 .extra2 = &max_max_tx_window 225 .extra2 = &max_max_tx_window
226 }, 226 },
@@ -230,8 +230,8 @@ static ctl_table irda_table[] = {
230 .data = &sysctl_max_noreply_time, 230 .data = &sysctl_max_noreply_time,
231 .maxlen = sizeof(int), 231 .maxlen = sizeof(int),
232 .mode = 0644, 232 .mode = 0644,
233 .proc_handler = &proc_dointvec_minmax, 233 .proc_handler = proc_dointvec_minmax,
234 .strategy = &sysctl_intvec, 234 .strategy = sysctl_intvec,
235 .extra1 = &min_max_noreply_time, 235 .extra1 = &min_max_noreply_time,
236 .extra2 = &max_max_noreply_time 236 .extra2 = &max_max_noreply_time
237 }, 237 },
@@ -241,8 +241,8 @@ static ctl_table irda_table[] = {
241 .data = &sysctl_warn_noreply_time, 241 .data = &sysctl_warn_noreply_time,
242 .maxlen = sizeof(int), 242 .maxlen = sizeof(int),
243 .mode = 0644, 243 .mode = 0644,
244 .proc_handler = &proc_dointvec_minmax, 244 .proc_handler = proc_dointvec_minmax,
245 .strategy = &sysctl_intvec, 245 .strategy = sysctl_intvec,
246 .extra1 = &min_warn_noreply_time, 246 .extra1 = &min_warn_noreply_time,
247 .extra2 = &max_warn_noreply_time 247 .extra2 = &max_warn_noreply_time
248 }, 248 },
@@ -252,8 +252,8 @@ static ctl_table irda_table[] = {
252 .data = &sysctl_lap_keepalive_time, 252 .data = &sysctl_lap_keepalive_time,
253 .maxlen = sizeof(int), 253 .maxlen = sizeof(int),
254 .mode = 0644, 254 .mode = 0644,
255 .proc_handler = &proc_dointvec_minmax, 255 .proc_handler = proc_dointvec_minmax,
256 .strategy = &sysctl_intvec, 256 .strategy = sysctl_intvec,
257 .extra1 = &min_lap_keepalive_time, 257 .extra1 = &min_lap_keepalive_time,
258 .extra2 = &max_lap_keepalive_time 258 .extra2 = &max_lap_keepalive_time
259 }, 259 },
generated by cgit v1.2.2 (git 2.25.0) at 2024-09-21 21:58:32 -0400