Skip to content

L
linux-davinci
Commit 92c3dd15 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files
Options

m68k: mac core - Kill warn_unused_result warnings 

warning: ignoring return value of 'request_irq', declared with attribute
warn_unused_result
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 8bd3968b
Show whitespace changes
Inline Side-by-side
Showing with 54 additions and 34 deletions
arch/m68k/mac/baboon.c
View file @ 92c3dd15
...@@ -92,7 +92,8 @@ static irqreturn_t baboon_irq(int irq, void *dev_id) ...@@ -92,7 +92,8 @@ static irqreturn_t baboon_irq(int irq, void *dev_id)
void __init baboon_register_interrupts(void) void __init baboon_register_interrupts(void)
{ {
baboon_disabled = 0; baboon_disabled = 0;
request_irq(IRQ_NUBUS_C, baboon_irq, 0, "baboon", (void *)baboon); if (request_irq(IRQ_NUBUS_C, baboon_irq, 0, "baboon", (void *)baboon))
pr_err("Couldn't register baboon interrupt\n");
} }
/* /*
......
arch/m68k/mac/iop.c
View file @ 92c3dd15
...@@ -305,14 +305,16 @@ void __init iop_register_interrupts(void) ...@@ -305,14 +305,16 @@ void __init iop_register_interrupts(void)
{ {
if (iop_ism_present) { if (iop_ism_present) {
if (oss_present) { if (oss_present) {
request_irq(OSS_IRQLEV_IOPISM, iop_ism_irq, if (request_irq(OSS_IRQLEV_IOPISM, iop_ism_irq,
IRQ_FLG_LOCK, "ISM IOP", IRQ_FLG_LOCK, "ISM IOP",
(void *) IOP_NUM_ISM); (void *) IOP_NUM_ISM))
pr_err("Couldn't register ISM IOP interrupt\n");
oss_irq_enable(IRQ_MAC_ADB); oss_irq_enable(IRQ_MAC_ADB);
} else { } else {
request_irq(IRQ_VIA2_0, iop_ism_irq, if (request_irq(IRQ_VIA2_0, iop_ism_irq,
IRQ_FLG_LOCK|IRQ_FLG_FAST, "ISM IOP", IRQ_FLG_LOCK|IRQ_FLG_FAST, "ISM IOP",
(void *) IOP_NUM_ISM); (void *) IOP_NUM_ISM))
pr_err("Couldn't register ISM IOP interrupt\n");
} }
if (!iop_alive(iop_base[IOP_NUM_ISM])) { if (!iop_alive(iop_base[IOP_NUM_ISM])) {
printk("IOP: oh my god, they killed the ISM IOP!\n"); printk("IOP: oh my god, they killed the ISM IOP!\n");
......
arch/m68k/mac/macints.c
View file @ 92c3dd15
...@@ -250,8 +250,9 @@ void __init mac_init_IRQ(void) ...@@ -250,8 +250,9 @@ void __init mac_init_IRQ(void)
if (baboon_present) if (baboon_present)
baboon_register_interrupts(); baboon_register_interrupts();
iop_register_interrupts(); iop_register_interrupts();
request_irq(IRQ_AUTO_7, mac_nmi_handler, 0, "NMI", if (request_irq(IRQ_AUTO_7, mac_nmi_handler, 0, "NMI",
mac_nmi_handler); mac_nmi_handler))
pr_err("Couldn't register NMI\n");
#ifdef DEBUG_MACINTS #ifdef DEBUG_MACINTS
printk("mac_init_IRQ(): Done!\n"); printk("mac_init_IRQ(): Done!\n");
#endif #endif
......
arch/m68k/mac/oss.c
View file @ 92c3dd15
...@@ -66,16 +66,21 @@ void __init oss_init(void) ...@@ -66,16 +66,21 @@ void __init oss_init(void)
void __init oss_register_interrupts(void) void __init oss_register_interrupts(void)
{ {
request_irq(OSS_IRQLEV_SCSI, oss_irq, IRQ_FLG_LOCK, if (request_irq(OSS_IRQLEV_SCSI, oss_irq, IRQ_FLG_LOCK,
"scsi", (void *) oss); "scsi", (void *) oss))
request_irq(OSS_IRQLEV_IOPSCC, mac_scc_dispatch, IRQ_FLG_LOCK, pr_err("Couldn't register %s interrupt\n", "scsi");
"scc", mac_scc_dispatch); if (request_irq(OSS_IRQLEV_IOPSCC, mac_scc_dispatch, IRQ_FLG_LOCK,
request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, IRQ_FLG_LOCK, "scc", mac_scc_dispatch))
"nubus", (void *) oss); pr_err("Couldn't register %s interrupt\n", "scc");
request_irq(OSS_IRQLEV_SOUND, oss_irq, IRQ_FLG_LOCK, if (request_irq(OSS_IRQLEV_NUBUS, oss_nubus_irq, IRQ_FLG_LOCK,
"sound", (void *) oss); "nubus", (void *) oss))
request_irq(OSS_IRQLEV_VIA1, via1_irq, IRQ_FLG_LOCK, pr_err("Couldn't register %s interrupt\n", "nubus");
"via1", (void *) via1); if (request_irq(OSS_IRQLEV_SOUND, oss_irq, IRQ_FLG_LOCK,
"sound", (void *) oss))
pr_err("Couldn't register %s interrupt\n", "sound");
if (request_irq(OSS_IRQLEV_VIA1, via1_irq, IRQ_FLG_LOCK,
"via1", (void *) via1))
pr_err("Couldn't register %s interrupt\n", "via1");
} }
/* /*
......
arch/m68k/mac/psc.c
View file @ 92c3dd15
...@@ -117,10 +117,14 @@ void __init psc_init(void) ...@@ -117,10 +117,14 @@ void __init psc_init(void)
void __init psc_register_interrupts(void) void __init psc_register_interrupts(void)
{ {
request_irq(IRQ_AUTO_3, psc_irq, 0, "psc3", (void *) 0x30); if (request_irq(IRQ_AUTO_3, psc_irq, 0, "psc3", (void *) 0x30))
request_irq(IRQ_AUTO_4, psc_irq, 0, "psc4", (void *) 0x40); pr_err("Couldn't register psc%d interrupt\n", 3);
request_irq(IRQ_AUTO_5, psc_irq, 0, "psc5", (void *) 0x50); if (request_irq(IRQ_AUTO_4, psc_irq, 0, "psc4", (void *) 0x40))
request_irq(IRQ_AUTO_6, psc_irq, 0, "psc6", (void *) 0x60); pr_err("Couldn't register psc%d interrupt\n", 4);
if (request_irq(IRQ_AUTO_5, psc_irq, 0, "psc5", (void *) 0x50))
pr_err("Couldn't register psc%d interrupt\n", 5);
if (request_irq(IRQ_AUTO_6, psc_irq, 0, "psc6", (void *) 0x60))
pr_err("Couldn't register psc%d interrupt\n", 6);
} }
/* /*
......
arch/m68k/mac/via.c
View file @ 92c3dd15
...@@ -283,7 +283,8 @@ void __init via_init_clock(irq_handler_t func) ...@@ -283,7 +283,8 @@ void __init via_init_clock(irq_handler_t func)
via1[vT1CL] = MAC_CLOCK_LOW; via1[vT1CL] = MAC_CLOCK_LOW;
via1[vT1CH] = MAC_CLOCK_HIGH; via1[vT1CH] = MAC_CLOCK_HIGH;
request_irq(IRQ_MAC_TIMER_1, func, IRQ_FLG_LOCK, "timer", func); if (request_irq(IRQ_MAC_TIMER_1, func, IRQ_FLG_LOCK, "timer", func))
pr_err("Couldn't register %s interrupt\n", "timer");
} }
/* /*
...@@ -293,25 +294,31 @@ void __init via_init_clock(irq_handler_t func) ...@@ -293,25 +294,31 @@ void __init via_init_clock(irq_handler_t func)
void __init via_register_interrupts(void) void __init via_register_interrupts(void)
{ {
if (via_alt_mapping) { if (via_alt_mapping) {
request_irq(IRQ_AUTO_1, via1_irq, if (request_irq(IRQ_AUTO_1, via1_irq,
IRQ_FLG_LOCK|IRQ_FLG_FAST, "software", IRQ_FLG_LOCK|IRQ_FLG_FAST, "software",
(void *) via1); (void *) via1))
request_irq(IRQ_AUTO_6, via1_irq, pr_err("Couldn't register %s interrupt\n", "software");
if (request_irq(IRQ_AUTO_6, via1_irq,
IRQ_FLG_LOCK|IRQ_FLG_FAST, "via1", IRQ_FLG_LOCK|IRQ_FLG_FAST, "via1",
(void *) via1); (void *) via1))
pr_err("Couldn't register %s interrupt\n", "via1");
} else { } else {
request_irq(IRQ_AUTO_1, via1_irq, if (request_irq(IRQ_AUTO_1, via1_irq,
IRQ_FLG_LOCK|IRQ_FLG_FAST, "via1", IRQ_FLG_LOCK|IRQ_FLG_FAST, "via1",
(void *) via1); (void *) via1))
pr_err("Couldn't register %s interrupt\n", "via1");
} }
request_irq(IRQ_AUTO_2, via2_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST, if (request_irq(IRQ_AUTO_2, via2_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST,
"via2", (void *) via2); "via2", (void *) via2))
pr_err("Couldn't register %s interrupt\n", "via2");
if (!psc_present) { if (!psc_present) {
request_irq(IRQ_AUTO_4, mac_scc_dispatch, IRQ_FLG_LOCK, if (request_irq(IRQ_AUTO_4, mac_scc_dispatch, IRQ_FLG_LOCK,
"scc", mac_scc_dispatch); "scc", mac_scc_dispatch))
pr_err("Couldn't register %s interrupt\n", "scc");
} }
request_irq(IRQ_MAC_NUBUS, via_nubus_irq, IRQ_FLG_LOCK|IRQ_FLG_FAST, if (request_irq(IRQ_MAC_NUBUS, via_nubus_irq,
"nubus", (void *) via2); IRQ_FLG_LOCK|IRQ_FLG_FAST, "nubus", (void *) via2))
pr_err("Couldn't register %s interrupt\n", "nubus");
} }
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment