Messages in this thread | | | Date | Sun, 20 Sep 2009 20:43:50 +0200 (CEST) | From | Jiri Kosina <> | Subject | Re: [PATCH] [TRIVIAL] Changes to IRQs. |
| |
On Sun, 20 Sep 2009, Krzysztof Halasa wrote:
> Trivial changes to IRQs. > > Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl> > > diff --git a/Documentation/DocBook/genericirq.tmpl b/Documentation/DocBook/genericirq.tmpl > index c671a01..1448b33 100644 > --- a/Documentation/DocBook/genericirq.tmpl > +++ b/Documentation/DocBook/genericirq.tmpl > @@ -417,8 +417,8 @@ desc->chip->end(); > </para> > <para> > To make use of the split implementation, replace the call to > - __do_IRQ by a call to desc->chip->handle_irq() and associate > - the appropriate handler function to desc->chip->handle_irq(). > + __do_IRQ by a call to desc->handle_irq() and associate > + the appropriate handler function to desc->handle_irq(). > In most cases the generic handler implementations should > be sufficient. > </para> > diff --git a/arch/arm/include/asm/hw_irq.h b/arch/arm/include/asm/hw_irq.h > index 90831f6..5b4e642 100644 > --- a/arch/arm/include/asm/hw_irq.h > +++ b/arch/arm/include/asm/hw_irq.h > @@ -10,14 +10,6 @@ static inline void ack_bad_irq(int irq) > irq_err_count++; > } > > -/* > - * Obsolete inline function for calling irq descriptor handlers. > - */ > -static inline void desc_handle_irq(unsigned int irq, struct irq_desc *desc) > -{ > - desc->handle_irq(irq, desc); > -} > - > void set_irq_flags(unsigned int irq, unsigned int flags); > > #define IRQF_VALID (1 << 0) > diff --git a/arch/arm/plat-orion/gpio.c b/arch/arm/plat-orion/gpio.c > index e814803..85f305a 100644 > --- a/arch/arm/plat-orion/gpio.c > +++ b/arch/arm/plat-orion/gpio.c > @@ -354,6 +354,6 @@ void orion_gpio_irq_handler(int pinoff) > polarity ^= 1 << (pin & 31); > writel(polarity, GPIO_IN_POL(pin)); > } > - desc_handle_irq(irq, desc); > + desc->handle_irq(irq, desc); > } > } > diff --git a/include/linux/irq.h b/include/linux/irq.h > index cb2e77a..b0424fe 100644 > --- a/include/linux/irq.h > +++ b/include/linux/irq.h > @@ -281,7 +281,7 @@ extern irqreturn_t handle_IRQ_event(unsigned int irq, struct irqaction *action); > > /* > * Built-in IRQ handlers for various IRQ types, > - * callable via desc->chip->handle_irq() > + * callable via desc->handle_irq() > */ > extern void handle_level_irq(unsigned int irq, struct irq_desc *desc); > extern void handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc); >
This doesn't really qualify for trivial queue, adding ARM addressess to CC (I hope I got them right after the latest flame :P) at least for the ARM bits.
-- Jiri Kosina SUSE Labs, Novell Inc. | |