sh: intc: install enable, disable and shutdown callbacks

Modify the intc code to install a disable callback. The current
solution without a disable callback results in use of the
generic default_disable() function. This function is a no-op
so suspend_device_irqs() will not disable any intc interrupts
at suspend time without this patch. Also, install enable and
shutdown callbacks while at it.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/drivers/sh/intc.c b/drivers/sh/intc.c
index 2269fbcaa1824c892ec91afa1409b96e37f7d03e..b75f701558230a76ca48829b46668db5f8d599fb 100644 (file)
--- a/drivers/sh/intc.c
+++ b/drivers/sh/intc.c
@@ -707,6 +707,9 @@ void __init register_intc_controller(struct intc_desc *desc)
        d->chip.mask = intc_disable;
        d->chip.unmask = intc_enable;
        d->chip.mask_ack = intc_disable;
+       d->chip.enable = intc_enable;
+       d->chip.disable = intc_disable;
+       d->chip.shutdown = intc_disable;
        d->chip.set_type = intc_set_sense;
 
 #if defined(CONFIG_CPU_SH3) || defined(CONFIG_CPU_SH4A)