diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 10:24:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-10 10:24:41 -0700 |
| commit | daba2b314a43c53be61eb98e0e88b094398196f5 (patch) | |
| tree | aa38a8a46eb6119f67ee7a6fefb5eabbe6e38c55 | |
| parent | 604a830d4fb5bf2334263bd597de22652e63b7e6 (diff) | |
| parent | 65543b3353e7d29d258aac4190cda6a2f49abeb3 (diff) | |
| download | linux-daba2b314a43c53be61eb98e0e88b094398196f5.tar.bz2 | |
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
| -rw-r--r-- | drivers/irqchip/irq-metag-ext.c | 1 | ||||
| -rw-r--r-- | drivers/irqchip/irq-vic.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/irqchip/irq-metag-ext.c b/drivers/irqchip/irq-metag-ext.c index 8c38b3d92e1c..0cdd923d1535 100644 --- a/drivers/irqchip/irq-metag-ext.c +++ b/drivers/irqchip/irq-metag-ext.c @@ -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 - * @irq: the virtual interrupt number * @desc: the interrupt description structure for this irq * * The cpu receives an interrupt on TR2 when a SoC interrupt has occurred. It is diff --git a/drivers/irqchip/irq-vic.c b/drivers/irqchip/irq-vic.c index f811a7de5857..74192f62dd67 100644 --- a/drivers/irqchip/irq-vic.c +++ b/drivers/irqchip/irq-vic.c @@ -498,7 +498,6 @@ void __init vic_init(void __iomem *base, unsigned int irq_start, * vic_init_cascaded() - initialise a cascaded vectored interrupt controller * @base: iomem base address * @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 * @resume_sources: bitmask of interrupt sources to allow for resume * |