aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/sh
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-03-30 00:15:49 +0200
committerThomas Gleixner <tglx@linutronix.de>2011-03-30 00:15:49 +0200
commit286b9bfe8ef6d97213c86bbaf30c250fd1f67568 (patch)
treec81242925dab34abd5333433a6f874219c5f91f8 /drivers/sh
parentx86: apb_timer: Fixup genirq fallout (diff)
downloadlinux-dev-286b9bfe8ef6d97213c86bbaf30c250fd1f67568.tar.xz
linux-dev-286b9bfe8ef6d97213c86bbaf30c250fd1f67568.zip
sh: Fix irq cleanup fallout
I missed that coccinelle does not fix up header files by default. Reported-by: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: Paul Mundt <lethal@linux-sh.org> Cc: <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh')
-rw-r--r--drivers/sh/intc/internals.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/sh/intc/internals.h b/drivers/sh/intc/internals.h
index df36a421e675..5b934851efa8 100644
--- a/drivers/sh/intc/internals.h
+++ b/drivers/sh/intc/internals.h
@@ -86,7 +86,7 @@ enum { MODE_ENABLE_REG = 0, /* Bit(s) set -> interrupt enabled */
static inline struct intc_desc_int *get_intc_desc(unsigned int irq)
{
- struct irq_chip *chip = get_irq_chip(irq);
+ struct irq_chip *chip = irq_get_chip(irq);
return container_of(chip, struct intc_desc_int, chip);
}
@@ -103,7 +103,7 @@ static inline void activate_irq(int irq)
set_irq_flags(irq, IRQF_VALID);
#else
/* same effect on other architectures */
- set_irq_noprobe(irq);
+ irq_set_noprobe(irq);
#endif
}