Commit daba2b31 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull irq fixes from Thomas Gleixner:
 "Two small kerneldoc fixes from Julia Lawall"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/metag-ext: Improve function-level documentation
  irqchip/vic: Improve function-level documentation
parents 604a830d 65543b33
...@@ -436,7 +436,6 @@ static int meta_intc_irq_set_type(struct irq_data *data, unsigned int flow_type) ...@@ -436,7 +436,6 @@ static int meta_intc_irq_set_type(struct irq_data *data, unsigned int flow_type)
/** /**
* meta_intc_irq_demux() - external irq de-multiplexer * meta_intc_irq_demux() - external irq de-multiplexer
* @irq: the virtual interrupt number
* @desc: the interrupt description structure for this irq * @desc: the interrupt description structure for this irq
* *
* The cpu receives an interrupt on TR2 when a SoC interrupt has occurred. It is * The cpu receives an interrupt on TR2 when a SoC interrupt has occurred. It is
......
...@@ -498,7 +498,6 @@ void __init vic_init(void __iomem *base, unsigned int irq_start, ...@@ -498,7 +498,6 @@ void __init vic_init(void __iomem *base, unsigned int irq_start,
* vic_init_cascaded() - initialise a cascaded vectored interrupt controller * vic_init_cascaded() - initialise a cascaded vectored interrupt controller
* @base: iomem base address * @base: iomem base address
* @parent_irq: the parent IRQ we're cascaded off * @parent_irq: the parent IRQ we're cascaded off
* @irq_start: starting interrupt number, must be muliple of 32
* @vic_sources: bitmask of interrupt sources to allow * @vic_sources: bitmask of interrupt sources to allow
* @resume_sources: bitmask of interrupt sources to allow for resume * @resume_sources: bitmask of interrupt sources to allow for resume
* *
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment