diff options
author | Hannes Eder <hannes@hanneseder.net> | 2008-12-13 00:11:28 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-13 00:11:28 -0500 |
commit | bcf91745091ba3b0813fa79afb5d10b090ea745d (patch) | |
tree | c4357b8036b19cdf7d0582637e567a0234fb53f4 /drivers/isdn | |
parent | 7a3c66e2d322c638e9306e739d96b2192dacde88 (diff) |
mISDN: use NULL pointer instead of plain integer
Fix more than 100 (all remaining in mISDN) sparse warnings:
drivers/isdn/hardware/mISDN/hfcmulti.c:***:**: warning: Using plain integer as NULL pointer
drivers/isdn/mISDN/dsp_tones.c:***:**: warning: Using plain integer as NULL pointer
drivers/isdn/mISDN/dsp_pipeline.c:***:**: warning: Using plain integer as NULL pointer
Signed-off-by: Hannes Eder <hannes@hanneseder.net>
Acked-by: Karsten Keil <kkeil@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
-rw-r--r-- | drivers/isdn/hardware/mISDN/hfcmulti.c | 2 | ||||
-rw-r--r-- | drivers/isdn/mISDN/dsp_pipeline.c | 2 | ||||
-rw-r--r-- | drivers/isdn/mISDN/dsp_tones.c | 90 |
3 files changed, 47 insertions, 47 deletions
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c index 1eac03f39d0..46684e13618 100644 --- a/drivers/isdn/hardware/mISDN/hfcmulti.c +++ b/drivers/isdn/hardware/mISDN/hfcmulti.c | |||
@@ -887,7 +887,7 @@ vpm_echocan_off(struct hfc_multi *hc, int ch) | |||
887 | static inline void | 887 | static inline void |
888 | hfcmulti_resync(struct hfc_multi *locked, struct hfc_multi *newmaster, int rm) | 888 | hfcmulti_resync(struct hfc_multi *locked, struct hfc_multi *newmaster, int rm) |
889 | { | 889 | { |
890 | struct hfc_multi *hc, *next, *pcmmaster = 0; | 890 | struct hfc_multi *hc, *next, *pcmmaster = NULL; |
891 | u_int *plx_acc_32, pv; | 891 | u_int *plx_acc_32, pv; |
892 | u_long flags; | 892 | u_long flags; |
893 | 893 | ||
diff --git a/drivers/isdn/mISDN/dsp_pipeline.c b/drivers/isdn/mISDN/dsp_pipeline.c index 850260ab57d..5ee6651b45b 100644 --- a/drivers/isdn/mISDN/dsp_pipeline.c +++ b/drivers/isdn/mISDN/dsp_pipeline.c | |||
@@ -249,7 +249,7 @@ int dsp_pipeline_build(struct dsp_pipeline *pipeline, const char *cfg) | |||
249 | name = strsep(&tok, "("); | 249 | name = strsep(&tok, "("); |
250 | args = strsep(&tok, ")"); | 250 | args = strsep(&tok, ")"); |
251 | if (args && !*args) | 251 | if (args && !*args) |
252 | args = 0; | 252 | args = NULL; |
253 | 253 | ||
254 | list_for_each_entry_safe(entry, n, &dsp_elements, list) | 254 | list_for_each_entry_safe(entry, n, &dsp_elements, list) |
255 | if (!strcmp(entry->elem->name, name)) { | 255 | if (!strcmp(entry->elem->name, name)) { |
diff --git a/drivers/isdn/mISDN/dsp_tones.c b/drivers/isdn/mISDN/dsp_tones.c index 23dd0dd2152..de4d0c9ac48 100644 --- a/drivers/isdn/mISDN/dsp_tones.c +++ b/drivers/isdn/mISDN/dsp_tones.c | |||
@@ -238,113 +238,113 @@ struct pattern { | |||
238 | u32 seq[10]; | 238 | u32 seq[10]; |
239 | } pattern[] = { | 239 | } pattern[] = { |
240 | {TONE_GERMAN_DIALTONE, | 240 | {TONE_GERMAN_DIALTONE, |
241 | {DATA_GA, 0, 0, 0, 0, 0, 0, 0, 0, 0}, | 241 | {DATA_GA, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
242 | {SIZE_GA, 0, 0, 0, 0, 0, 0, 0, 0, 0}, | 242 | {SIZE_GA, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
243 | {1900, 0, 0, 0, 0, 0, 0, 0, 0, 0} }, | 243 | {1900, 0, 0, 0, 0, 0, 0, 0, 0, 0} }, |
244 | 244 | ||
245 | {TONE_GERMAN_OLDDIALTONE, | 245 | {TONE_GERMAN_OLDDIALTONE, |
246 | {DATA_GO, 0, 0, 0, 0, 0, 0, 0, 0, 0}, | 246 | {DATA_GO, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
247 | {SIZE_GO, 0, 0, 0, 0, 0, 0, 0, 0, 0}, | 247 | {SIZE_GO, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
248 | {1998, 0, 0, 0, 0, 0, 0, 0, 0, 0} }, | 248 | {1998, 0, 0, 0, 0, 0, 0, 0, 0, 0} }, |
249 | 249 | ||
250 | {TONE_AMERICAN_DIALTONE, | 250 | {TONE_AMERICAN_DIALTONE, |
251 | {DATA_DT, 0, 0, 0, 0, 0, 0, 0, 0, 0}, | 251 | {DATA_DT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
252 | {SIZE_DT, 0, 0, 0, 0, 0, 0, 0, 0, 0}, | 252 | {SIZE_DT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
253 | {8000, 0, 0, 0, 0, 0, 0, 0, 0, 0} }, | 253 | {8000, 0, 0, 0, 0, 0, 0, 0, 0, 0} }, |
254 | 254 | ||
255 | {TONE_GERMAN_DIALPBX, | 255 | {TONE_GERMAN_DIALPBX, |
256 | {DATA_GA, DATA_S, DATA_GA, DATA_S, DATA_GA, DATA_S, 0, 0, 0, 0}, | 256 | {DATA_GA, DATA_S, DATA_GA, DATA_S, DATA_GA, DATA_S, NULL, NULL, NULL, NULL}, |
257 | {SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, 0, 0, 0, 0}, | 257 | {SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, NULL, NULL, NULL, NULL}, |
258 | {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} }, | 258 | {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} }, |
259 | 259 | ||
260 | {TONE_GERMAN_OLDDIALPBX, | 260 | {TONE_GERMAN_OLDDIALPBX, |
261 | {DATA_GO, DATA_S, DATA_GO, DATA_S, DATA_GO, DATA_S, 0, 0, 0, 0}, | 261 | {DATA_GO, DATA_S, DATA_GO, DATA_S, DATA_GO, DATA_S, NULL, NULL, NULL, NULL}, |
262 | {SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, 0, 0, 0, 0}, | 262 | {SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, NULL, NULL, NULL, NULL}, |
263 | {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} }, | 263 | {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} }, |
264 | 264 | ||
265 | {TONE_AMERICAN_DIALPBX, | 265 | {TONE_AMERICAN_DIALPBX, |
266 | {DATA_DT, DATA_S, DATA_DT, DATA_S, DATA_DT, DATA_S, 0, 0, 0, 0}, | 266 | {DATA_DT, DATA_S, DATA_DT, DATA_S, DATA_DT, DATA_S, NULL, NULL, NULL, NULL}, |
267 | {SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, 0, 0, 0, 0}, | 267 | {SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, SIZE_DT, SIZE_S, NULL, NULL, NULL, NULL}, |
268 | {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} }, | 268 | {2000, 2000, 2000, 2000, 2000, 12000, 0, 0, 0, 0} }, |
269 | 269 | ||
270 | {TONE_GERMAN_RINGING, | 270 | {TONE_GERMAN_RINGING, |
271 | {DATA_GA, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 271 | {DATA_GA, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
272 | {SIZE_GA, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 272 | {SIZE_GA, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
273 | {8000, 32000, 0, 0, 0, 0, 0, 0, 0, 0} }, | 273 | {8000, 32000, 0, 0, 0, 0, 0, 0, 0, 0} }, |
274 | 274 | ||
275 | {TONE_GERMAN_OLDRINGING, | 275 | {TONE_GERMAN_OLDRINGING, |
276 | {DATA_GO, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 276 | {DATA_GO, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
277 | {SIZE_GO, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 277 | {SIZE_GO, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
278 | {8000, 40000, 0, 0, 0, 0, 0, 0, 0, 0} }, | 278 | {8000, 40000, 0, 0, 0, 0, 0, 0, 0, 0} }, |
279 | 279 | ||
280 | {TONE_AMERICAN_RINGING, | 280 | {TONE_AMERICAN_RINGING, |
281 | {DATA_RI, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 281 | {DATA_RI, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
282 | {SIZE_RI, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 282 | {SIZE_RI, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
283 | {8000, 32000, 0, 0, 0, 0, 0, 0, 0, 0} }, | 283 | {8000, 32000, 0, 0, 0, 0, 0, 0, 0, 0} }, |
284 | 284 | ||
285 | {TONE_GERMAN_RINGPBX, | 285 | {TONE_GERMAN_RINGPBX, |
286 | {DATA_GA, DATA_S, DATA_GA, DATA_S, 0, 0, 0, 0, 0, 0}, | 286 | {DATA_GA, DATA_S, DATA_GA, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL}, |
287 | {SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, 0, 0, 0, 0, 0, 0}, | 287 | {SIZE_GA, SIZE_S, SIZE_GA, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL}, |
288 | {4000, 4000, 4000, 28000, 0, 0, 0, 0, 0, 0} }, | 288 | {4000, 4000, 4000, 28000, 0, 0, 0, 0, 0, 0} }, |
289 | 289 | ||
290 | {TONE_GERMAN_OLDRINGPBX, | 290 | {TONE_GERMAN_OLDRINGPBX, |
291 | {DATA_GO, DATA_S, DATA_GO, DATA_S, 0, 0, 0, 0, 0, 0}, | 291 | {DATA_GO, DATA_S, DATA_GO, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL}, |
292 | {SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, 0, 0, 0, 0, 0, 0}, | 292 | {SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL}, |
293 | {4000, 4000, 4000, 28000, 0, 0, 0, 0, 0, 0} }, | 293 | {4000, 4000, 4000, 28000, 0, 0, 0, 0, 0, 0} }, |
294 | 294 | ||
295 | {TONE_AMERICAN_RINGPBX, | 295 | {TONE_AMERICAN_RINGPBX, |
296 | {DATA_RI, DATA_S, DATA_RI, DATA_S, 0, 0, 0, 0, 0, 0}, | 296 | {DATA_RI, DATA_S, DATA_RI, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL}, |
297 | {SIZE_RI, SIZE_S, SIZE_RI, SIZE_S, 0, 0, 0, 0, 0, 0}, | 297 | {SIZE_RI, SIZE_S, SIZE_RI, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL}, |
298 | {4000, 4000, 4000, 28000, 0, 0, 0, 0, 0, 0} }, | 298 | {4000, 4000, 4000, 28000, 0, 0, 0, 0, 0, 0} }, |
299 | 299 | ||
300 | {TONE_GERMAN_BUSY, | 300 | {TONE_GERMAN_BUSY, |
301 | {DATA_GA, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 301 | {DATA_GA, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
302 | {SIZE_GA, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 302 | {SIZE_GA, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
303 | {4000, 4000, 0, 0, 0, 0, 0, 0, 0, 0} }, | 303 | {4000, 4000, 0, 0, 0, 0, 0, 0, 0, 0} }, |
304 | 304 | ||
305 | {TONE_GERMAN_OLDBUSY, | 305 | {TONE_GERMAN_OLDBUSY, |
306 | {DATA_GO, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 306 | {DATA_GO, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
307 | {SIZE_GO, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 307 | {SIZE_GO, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
308 | {1000, 5000, 0, 0, 0, 0, 0, 0, 0, 0} }, | 308 | {1000, 5000, 0, 0, 0, 0, 0, 0, 0, 0} }, |
309 | 309 | ||
310 | {TONE_AMERICAN_BUSY, | 310 | {TONE_AMERICAN_BUSY, |
311 | {DATA_BU, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 311 | {DATA_BU, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
312 | {SIZE_BU, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 312 | {SIZE_BU, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
313 | {4000, 4000, 0, 0, 0, 0, 0, 0, 0, 0} }, | 313 | {4000, 4000, 0, 0, 0, 0, 0, 0, 0, 0} }, |
314 | 314 | ||
315 | {TONE_GERMAN_HANGUP, | 315 | {TONE_GERMAN_HANGUP, |
316 | {DATA_GA, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 316 | {DATA_GA, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
317 | {SIZE_GA, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 317 | {SIZE_GA, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
318 | {4000, 4000, 0, 0, 0, 0, 0, 0, 0, 0} }, | 318 | {4000, 4000, 0, 0, 0, 0, 0, 0, 0, 0} }, |
319 | 319 | ||
320 | {TONE_GERMAN_OLDHANGUP, | 320 | {TONE_GERMAN_OLDHANGUP, |
321 | {DATA_GO, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 321 | {DATA_GO, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
322 | {SIZE_GO, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 322 | {SIZE_GO, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
323 | {1000, 5000, 0, 0, 0, 0, 0, 0, 0, 0} }, | 323 | {1000, 5000, 0, 0, 0, 0, 0, 0, 0, 0} }, |
324 | 324 | ||
325 | {TONE_AMERICAN_HANGUP, | 325 | {TONE_AMERICAN_HANGUP, |
326 | {DATA_DT, 0, 0, 0, 0, 0, 0, 0, 0, 0}, | 326 | {DATA_DT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
327 | {SIZE_DT, 0, 0, 0, 0, 0, 0, 0, 0, 0}, | 327 | {SIZE_DT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
328 | {8000, 0, 0, 0, 0, 0, 0, 0, 0, 0} }, | 328 | {8000, 0, 0, 0, 0, 0, 0, 0, 0, 0} }, |
329 | 329 | ||
330 | {TONE_SPECIAL_INFO, | 330 | {TONE_SPECIAL_INFO, |
331 | {DATA_S1, DATA_S2, DATA_S3, DATA_S, 0, 0, 0, 0, 0, 0}, | 331 | {DATA_S1, DATA_S2, DATA_S3, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL}, |
332 | {SIZE_S1, SIZE_S2, SIZE_S3, SIZE_S, 0, 0, 0, 0, 0, 0}, | 332 | {SIZE_S1, SIZE_S2, SIZE_S3, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL}, |
333 | {2666, 2666, 2666, 8002, 0, 0, 0, 0, 0, 0} }, | 333 | {2666, 2666, 2666, 8002, 0, 0, 0, 0, 0, 0} }, |
334 | 334 | ||
335 | {TONE_GERMAN_GASSENBESETZT, | 335 | {TONE_GERMAN_GASSENBESETZT, |
336 | {DATA_GA, DATA_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 336 | {DATA_GA, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
337 | {SIZE_GA, SIZE_S, 0, 0, 0, 0, 0, 0, 0, 0}, | 337 | {SIZE_GA, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
338 | {2000, 2000, 0, 0, 0, 0, 0, 0, 0, 0} }, | 338 | {2000, 2000, 0, 0, 0, 0, 0, 0, 0, 0} }, |
339 | 339 | ||
340 | {TONE_GERMAN_AUFSCHALTTON, | 340 | {TONE_GERMAN_AUFSCHALTTON, |
341 | {DATA_GO, DATA_S, DATA_GO, DATA_S, 0, 0, 0, 0, 0, 0}, | 341 | {DATA_GO, DATA_S, DATA_GO, DATA_S, NULL, NULL, NULL, NULL, NULL, NULL}, |
342 | {SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, 0, 0, 0, 0, 0, 0}, | 342 | {SIZE_GO, SIZE_S, SIZE_GO, SIZE_S, NULL, NULL, NULL, NULL, NULL, NULL}, |
343 | {1000, 5000, 1000, 17000, 0, 0, 0, 0, 0, 0} }, | 343 | {1000, 5000, 1000, 17000, 0, 0, 0, 0, 0, 0} }, |
344 | 344 | ||
345 | {0, | 345 | {0, |
346 | {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, | 346 | {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
347 | {0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, | 347 | {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}, |
348 | {0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }, | 348 | {0, 0, 0, 0, 0, 0, 0, 0, 0, 0} }, |
349 | }; | 349 | }; |
350 | 350 | ||
@@ -467,7 +467,7 @@ dsp_tone_timeout(void *arg) | |||
467 | 467 | ||
468 | /* set next tone */ | 468 | /* set next tone */ |
469 | if (pat->data[index] == DATA_S) | 469 | if (pat->data[index] == DATA_S) |
470 | dsp_tone_hw_message(dsp, 0, 0); | 470 | dsp_tone_hw_message(dsp, NULL, 0); |
471 | else | 471 | else |
472 | dsp_tone_hw_message(dsp, pat->data[index], *(pat->siz[index])); | 472 | dsp_tone_hw_message(dsp, pat->data[index], *(pat->siz[index])); |
473 | /* set timer */ | 473 | /* set timer */ |