Commit dd1f17a9 authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Thomas Gleixner
Browse files

irqchip/irq-brcmstb-l2: Replace brcmstb_l2_mask_and_ack() by generic function 



Replace brcmstb_l2_mask_and_ack() by the generic
irq_gc_mask_disable_and_ack_set().

brcmstb_l2_mask_and_ack() was added in commit 49aa6ef0
("irqchip/brcmstb-l2: Remove some processing from the handler") in
September 2017 with a comment saying it was actually generic and someone
should add it to the generic code.

commit 20608924 ("genirq: generic chip: Add
irq_gc_mask_disable_and_ack_set()") did that a few weeks later, however no
one went back and took the brcmstb variant out.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarFlorian Fainelli <florian.fainelli@broadcom.com>
Link: https://lore.kernel.org/all/20241224001727.149337-1-linux@treblig.org
parent 877c76db

drivers/irqchip/irq-brcmstb-l2.c

+1 −27
Original line number Diff line number Diff line
@@ -61,32 +61,6 @@ struct brcmstb_l2_intc_data { 
	u32 saved_mask; /* for suspend/resume */

};



/**

 * brcmstb_l2_mask_and_ack - Mask and ack pending interrupt

 * @d: irq_data

 *

 * Chip has separate enable/disable registers instead of a single mask

 * register and pending interrupt is acknowledged by setting a bit.

 *

 * Note: This function is generic and could easily be added to the

 * generic irqchip implementation if there ever becomes a will to do so.

 * Perhaps with a name like irq_gc_mask_disable_and_ack_set().

 *

 * e.g.: https://patchwork.kernel.org/patch/9831047/

 */

static void brcmstb_l2_mask_and_ack(struct irq_data *d)

{

	struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);

	struct irq_chip_type *ct = irq_data_get_chip_type(d);

	u32 mask = d->mask;



	irq_gc_lock(gc);

	irq_reg_writel(gc, mask, ct->regs.disable);

	*ct->mask_cache &= ~mask;

	irq_reg_writel(gc, mask, ct->regs.ack);

	irq_gc_unlock(gc);

}



static void brcmstb_l2_intc_irq_handle(struct irq_desc *desc)

{

	struct brcmstb_l2_intc_data *b = irq_desc_get_handler_data(desc);
@@ -248,7 +222,7 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np, 
	if (init_params->cpu_clear >= 0) {

		ct->regs.ack = init_params->cpu_clear;

		ct->chip.irq_ack = irq_gc_ack_set_bit;

		ct->chip.irq_mask_ack = brcmstb_l2_mask_and_ack;

		ct->chip.irq_mask_ack = irq_gc_mask_disable_and_ack_set;

	} else {

		/* No Ack - but still slightly more efficient to define this */

		ct->chip.irq_mask_ack = irq_gc_mask_disable_reg;