Messages in this thread | | | Date | Sat, 6 Feb 2010 12:05:06 -0800 | From | Brandon Philips <> | Subject | Re: [PATCH v3] x86: keep chip_data in create_irq_nr and destroy_irq |
| |
On 23:16 Fri 05 Feb 2010, Yinghai Lu wrote: > On 02/05/2010 10:42 PM, Brandon Philips wrote: > @@ -3308,17 +3305,12 @@ void destroy_irq(unsigned int irq) > { > unsigned long flags; > struct irq_cfg *cfg; > - struct irq_desc *desc; > > - /* store it, in case dynamic_irq_cleanup clear it */ > - desc = irq_to_desc(irq); > - cfg = desc->chip_data; > - dynamic_irq_cleanup(irq); > - /* connect back irq_cfg */ > - desc->chip_data = cfg; > + dynamic_irq_cleanup_keep_chip_data(irq); > > free_irte(irq); > spin_lock_irqsave(&vector_lock, flags); > + cfg = irq_to_desc(irq)->chip_data; > __clear_irq_vector(irq, cfg);
Or even two lines better!
void destroy_irq(unsigned int irq) { unsigned long flags; - struct irq_cfg *cfg; - struct irq_desc *desc; - /* store it, in case dynamic_irq_cleanup clear it */ - desc = irq_to_desc(irq); - cfg = desc->chip_data; - dynamic_irq_cleanup(irq); - /* connect back irq_cfg */ - desc->chip_data = cfg; + dynamic_irq_cleanup_keep_chip_data(irq); free_irte(irq); spin_lock_irqsave(&vector_lock, flags); - __clear_irq_vector(irq, cfg); + __clear_irq_vector(irq, get_irq_chip_data(irq)); spin_unlock_irqrestore(&vector_lock, flags); }
Sigh... I guess I will send the patch again :D
Cheers,
Brandon
| |