genirq: Forgotten updates/deletions after removal of compat code

commit 0c6f8a8b917ad361319c8ace3e9f28e69bfdb4c1 ("genirq: Remove compat code")
removed the compat code, but forgot to update some references in comments and
delete some of its documentation.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: http://lkml.kernel.org/r/%3C1302426113-13808-1-git-send-email-geert%40linux-m68k.org%3E
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/include/linux/irq.h b/include/linux/irq.h
index 09a3080..a71dd18 100644 (file)
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -53,7 +53,7 @@ typedef       void (*irq_preflow_handler_t)(struct irq_data *data);
  * Bits which can be modified via irq_set/clear/modify_status_flags()
  * IRQ_LEVEL                   - Interrupt is level type. Will be also
  *                               updated in the code when the above trigger
  * Bits which can be modified via irq_set/clear/modify_status_flags()
  * IRQ_LEVEL                   - Interrupt is level type. Will be also
  *                               updated in the code when the above trigger

- *                               bits are modified via set_irq_type()
+ *                               bits are modified via irq_set_irq_type()

  * IRQ_PER_CPU                 - Mark an interrupt PER_CPU. Will protect
  *                               it from affinity setting
  * IRQ_NOPROBE                 - Interrupt cannot be probed by autoprobing
  * IRQ_PER_CPU                 - Mark an interrupt PER_CPU. Will protect
  *                               it from affinity setting
  * IRQ_NOPROBE                 - Interrupt cannot be probed by autoprobing


@@ -261,23 +261,6 @@ static inline void irqd_clr_chained_irq_inprogress(struct irq_data *d)
  * struct irq_chip - hardware interrupt chip descriptor
  *
  * @name:              name for /proc/interrupts
  * struct irq_chip - hardware interrupt chip descriptor
  *
  * @name:              name for /proc/interrupts

- * @startup:           deprecated, replaced by irq_startup
- * @shutdown:          deprecated, replaced by irq_shutdown
- * @enable:            deprecated, replaced by irq_enable
- * @disable:           deprecated, replaced by irq_disable
- * @ack:               deprecated, replaced by irq_ack
- * @mask:              deprecated, replaced by irq_mask
- * @mask_ack:          deprecated, replaced by irq_mask_ack
- * @unmask:            deprecated, replaced by irq_unmask
- * @eoi:               deprecated, replaced by irq_eoi
- * @end:               deprecated, will go away with __do_IRQ()
- * @set_affinity:      deprecated, replaced by irq_set_affinity
- * @retrigger:         deprecated, replaced by irq_retrigger
- * @set_type:          deprecated, replaced by irq_set_type
- * @set_wake:          deprecated, replaced by irq_wake
- * @bus_lock:          deprecated, replaced by irq_bus_lock
- * @bus_sync_unlock:   deprecated, replaced by irq_bus_sync_unlock
- *

  * @irq_startup:       start up the interrupt (defaults to ->enable if NULL)
  * @irq_shutdown:      shut down the interrupt (defaults to ->disable if NULL)
  * @irq_enable:                enable the interrupt (defaults to chip->unmask if NULL)
  * @irq_startup:       start up the interrupt (defaults to ->enable if NULL)
  * @irq_shutdown:      shut down the interrupt (defaults to ->disable if NULL)
  * @irq_enable:                enable the interrupt (defaults to chip->unmask if NULL)

diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
index a082905..8e1dc8e 100644 (file)
--- a/include/linux/irqdesc.h
+++ b/include/linux/irqdesc.h
@@ -21,7 +21,7 @@ struct timer_rand_state;
  * @status:            status information
  * @core_internal_state__do_not_mess_with_it: core internal status information
  * @depth:             disable-depth, for nested irq_disable() calls
  * @status:            status information
  * @core_internal_state__do_not_mess_with_it: core internal status information
  * @depth:             disable-depth, for nested irq_disable() calls

- * @wake_depth:                enable depth, for multiple set_irq_wake() callers
+ * @wake_depth:                enable depth, for multiple irq_set_irq_wake() callers

  * @irq_count:         stats field to detect stalled irqs
  * @last_unhandled:    aging timer for unhandled count
  * @irqs_unhandled:    stats field for spurious unhandled interrupts
  * @irq_count:         stats field to detect stalled irqs
  * @last_unhandled:    aging timer for unhandled count
  * @irqs_unhandled:    stats field for spurious unhandled interrupts