diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2008-12-30 08:25:31 -0500 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2009-01-12 14:56:42 -0500 |
| commit | 89bde7b86e21291ef091dc6ad3e63412f7c6ddd9 (patch) | |
| tree | d78e96ec062f5923cc1c4b05a6125958fee43546 /sound/oss | |
| parent | 11a8b2c5cde1377c716087df0866d7dc5a6d5d10 (diff) | |
m68k: dmasound - Kill warn_unused_result warnings
warning: ignoring return value of 'request_irq', declared with attribute
warn_unused_result
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/dmasound/dmasound_atari.c | 5 | ||||
| -rw-r--r-- | sound/oss/dmasound/dmasound_q40.c | 16 |
2 files changed, 13 insertions, 8 deletions
diff --git a/sound/oss/dmasound/dmasound_atari.c b/sound/oss/dmasound/dmasound_atari.c index 4d45bd63718b..57d9f154c88b 100644 --- a/sound/oss/dmasound/dmasound_atari.c +++ b/sound/oss/dmasound/dmasound_atari.c | |||
| @@ -851,8 +851,9 @@ static int __init AtaIrqInit(void) | |||
| 851 | mfp.tim_dt_a = 1; /* Cause interrupt after first event. */ | 851 | mfp.tim_dt_a = 1; /* Cause interrupt after first event. */ |
| 852 | mfp.tim_ct_a = 8; /* Turn on event counting. */ | 852 | mfp.tim_ct_a = 8; /* Turn on event counting. */ |
| 853 | /* Register interrupt handler. */ | 853 | /* Register interrupt handler. */ |
| 854 | request_irq(IRQ_MFP_TIMA, AtaInterrupt, IRQ_TYPE_SLOW, "DMA sound", | 854 | if (request_irq(IRQ_MFP_TIMA, AtaInterrupt, IRQ_TYPE_SLOW, "DMA sound", |
| 855 | AtaInterrupt); | 855 | AtaInterrupt)) |
| 856 | return 0; | ||
| 856 | mfp.int_en_a |= 0x20; /* Turn interrupt on. */ | 857 | mfp.int_en_a |= 0x20; /* Turn interrupt on. */ |
| 857 | mfp.int_mk_a |= 0x20; | 858 | mfp.int_mk_a |= 0x20; |
| 858 | return 1; | 859 | return 1; |
diff --git a/sound/oss/dmasound/dmasound_q40.c b/sound/oss/dmasound/dmasound_q40.c index 1855b14d90c3..99bcb21c2281 100644 --- a/sound/oss/dmasound/dmasound_q40.c +++ b/sound/oss/dmasound/dmasound_q40.c | |||
| @@ -371,8 +371,9 @@ static void Q40Free(void *ptr, unsigned int size) | |||
| 371 | static int __init Q40IrqInit(void) | 371 | static int __init Q40IrqInit(void) |
| 372 | { | 372 | { |
| 373 | /* Register interrupt handler. */ | 373 | /* Register interrupt handler. */ |
| 374 | request_irq(Q40_IRQ_SAMPLE, Q40StereoInterrupt, 0, | 374 | if (request_irq(Q40_IRQ_SAMPLE, Q40StereoInterrupt, 0, |
| 375 | "DMA sound", Q40Interrupt); | 375 | "DMA sound", Q40Interrupt)) |
| 376 | return 0; | ||
| 376 | 377 | ||
| 377 | return(1); | 378 | return(1); |
| 378 | } | 379 | } |
| @@ -401,6 +402,7 @@ static void Q40PlayNextFrame(int index) | |||
| 401 | u_char *start; | 402 | u_char *start; |
| 402 | u_long size; | 403 | u_long size; |
| 403 | u_char speed; | 404 | u_char speed; |
| 405 | int error; | ||
| 404 | 406 | ||
| 405 | /* used by Q40Play() if all doubts whether there really is something | 407 | /* used by Q40Play() if all doubts whether there really is something |
| 406 | * to be played are already wiped out. | 408 | * to be played are already wiped out. |
| @@ -419,11 +421,13 @@ static void Q40PlayNextFrame(int index) | |||
| 419 | master_outb( 0,SAMPLE_ENABLE_REG); | 421 | master_outb( 0,SAMPLE_ENABLE_REG); |
| 420 | free_irq(Q40_IRQ_SAMPLE, Q40Interrupt); | 422 | free_irq(Q40_IRQ_SAMPLE, Q40Interrupt); |
| 421 | if (dmasound.soft.stereo) | 423 | if (dmasound.soft.stereo) |
| 422 | request_irq(Q40_IRQ_SAMPLE, Q40StereoInterrupt, 0, | 424 | error = request_irq(Q40_IRQ_SAMPLE, Q40StereoInterrupt, 0, |
| 423 | "Q40 sound", Q40Interrupt); | 425 | "Q40 sound", Q40Interrupt); |
| 424 | else | 426 | else |
| 425 | request_irq(Q40_IRQ_SAMPLE, Q40MonoInterrupt, 0, | 427 | error = request_irq(Q40_IRQ_SAMPLE, Q40MonoInterrupt, 0, |
| 426 | "Q40 sound", Q40Interrupt); | 428 | "Q40 sound", Q40Interrupt); |
| 429 | if (error && printk_ratelimit()) | ||
| 430 | pr_err("Couldn't register sound interrupt\n"); | ||
| 427 | 431 | ||
| 428 | master_outb( speed, SAMPLE_RATE_REG); | 432 | master_outb( speed, SAMPLE_RATE_REG); |
| 429 | master_outb( 1,SAMPLE_CLEAR_REG); | 433 | master_outb( 1,SAMPLE_CLEAR_REG); |
