Merge tag 'v3.5-rc7' into late/soc

[firefly-linux-kernel-4.4.55.git] / include / linux / irq.h

diff --git a/include/linux/irq.h b/include/linux/irq.h
index b27cfcfd3a59c15319488580a14de42c18174744..a5261e3d2e3c26f3cf645af875e4093d5adcaa77 100644 (file)
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -301,8 +301,6 @@ static inline irq_hw_number_t irqd_to_hwirq(struct irq_data *d)
  * @irq_pm_shutdown:   function called from core code on shutdown once per chip
  * @irq_print_chip:    optional to print special chip info in show_interrupts
  * @flags:             chip specific flags
- *
- * @release:           release function solely used by UML
  */
 struct irq_chip {
        const char      *name;
@@ -335,11 +333,6 @@ struct irq_chip {
        void            (*irq_print_chip)(struct irq_data *data, struct seq_file *p);
 
        unsigned long   flags;
-
-       /* Currently used only by UML, might disappear one day.*/
-#ifdef CONFIG_IRQ_RELEASE_METHOD
-       void            (*release)(unsigned int irq, void *dev_id);
-#endif
 };
 
 /*