Message ID | 20231017122718.5062-1-keguang.zhang@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | irqchip: Drop the custom fixes for the same irq_chip name | expand |
Dne torek, 17. oktober 2023 ob 14:27:18 CEST je Keguang Zhang napisal(a): > Since commit 021a8ca2ba23 ("genirq/generic-chip: Fix the irq_chip name > for /proc/interrupts "), the chip name of all chip types are set to the > same name by irq_init_generic_chip() now. Those custom fixes for > the same irq_chip name are no longer needed. > So drop them. > > Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com> > --- > drivers/irqchip/irq-sunxi-nmi.c | 1 - For sunxi: Acked-by: Jernej Skrabec <jernej.skrabec@gmail.com> Best regards, Jernej > drivers/irqchip/irq-tb10x.c | 1 - > 2 files changed, 2 deletions(-)
diff --git a/drivers/irqchip/irq-sunxi-nmi.c b/drivers/irqchip/irq-sunxi-nmi.c index e760b1278143..bb92fd85e975 100644 --- a/drivers/irqchip/irq-sunxi-nmi.c +++ b/drivers/irqchip/irq-sunxi-nmi.c @@ -192,7 +192,6 @@ static int __init sunxi_sc_nmi_irq_init(struct device_node *node, gc->chip_types[0].regs.type = reg_offs->ctrl; gc->chip_types[1].type = IRQ_TYPE_EDGE_BOTH; - gc->chip_types[1].chip.name = gc->chip_types[0].chip.name; gc->chip_types[1].chip.irq_ack = irq_gc_ack_set_bit; gc->chip_types[1].chip.irq_mask = irq_gc_mask_clr_bit; gc->chip_types[1].chip.irq_unmask = irq_gc_mask_set_bit; diff --git a/drivers/irqchip/irq-tb10x.c b/drivers/irqchip/irq-tb10x.c index 680586354d12..d59bfbe8c6d0 100644 --- a/drivers/irqchip/irq-tb10x.c +++ b/drivers/irqchip/irq-tb10x.c @@ -150,7 +150,6 @@ static int __init of_tb10x_init_irq(struct device_node *ictl, gc->chip_types[0].regs.mask = AB_IRQCTL_INT_ENABLE; gc->chip_types[1].type = IRQ_TYPE_EDGE_BOTH; - gc->chip_types[1].chip.name = gc->chip_types[0].chip.name; gc->chip_types[1].chip.irq_ack = irq_gc_ack_set_bit; gc->chip_types[1].chip.irq_mask = irq_gc_mask_clr_bit; gc->chip_types[1].chip.irq_unmask = irq_gc_mask_set_bit;
Since commit 021a8ca2ba23 ("genirq/generic-chip: Fix the irq_chip name for /proc/interrupts "), the chip name of all chip types are set to the same name by irq_init_generic_chip() now. Those custom fixes for the same irq_chip name are no longer needed. So drop them. Signed-off-by: Keguang Zhang <keguang.zhang@gmail.com> --- drivers/irqchip/irq-sunxi-nmi.c | 1 - drivers/irqchip/irq-tb10x.c | 1 - 2 files changed, 2 deletions(-) base-commit: 4d0515b235dec789578d135a5db586b25c5870cb