diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-11-02 21:18:08 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-11-02 21:18:08 +0300 |
| commit | 722c908f84c67bf120105ca870675cadc1bb7b20 (patch) | |
| tree | 1fb261d952624623e35f1f4ec958c7b4e4226d96 /kernel/irq | |
| parent | 10d94ff4d558b96bfc4f55bb0051ae4d938246fe (diff) | |
| parent | 61dc367e5d767e1c56147f6e497d13cc2771abb1 (diff) | |
| download | linux-722c908f84c67bf120105ca870675cadc1bb7b20.tar.xz | |
Merge tag 'irqchip-4.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull the second batch of irqchip updates for 4.15 from marc Zyngier:
- A number of MIPS GIC updates and cleanups
- One GICv4 update
- Another firmware workaround for GICv2
- Support for Mason8 GPIOs
- Tiny documentation fix
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/generic-chip.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c index f7086b78ad6e..5270a54b9fa4 100644 --- a/kernel/irq/generic-chip.c +++ b/kernel/irq/generic-chip.c @@ -322,7 +322,6 @@ int __irq_alloc_domain_generic_chips(struct irq_domain *d, int irqs_per_chip, /* Calc pointer to the next generic chip */ tmp += sizeof(*gc) + num_ct * sizeof(struct irq_chip_type); } - d->name = name; return 0; } EXPORT_SYMBOL_GPL(__irq_alloc_domain_generic_chips); |