Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d08af35 authored by Doug Berger's avatar Doug Berger Committed by Marc Zyngier
Browse files

genirq: generic chip: remove irq_gc_mask_disable_reg_and_ack() 



Any usage of the irq_gc_mask_disable_reg_and_ack() function has
been replaced with the desired functionality.

The incorrect and ambiguously named function is removed here to
prevent accidental misuse.

Signed-off-by: default avatarDoug Berger <opendmb@gmail.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 16150904

include/linux/irq.h

+0 −1
Original line number Diff line number Diff line
@@ -1009,7 +1009,6 @@ void irq_gc_mask_clr_bit(struct irq_data *d); 
void irq_gc_unmask_enable_reg(struct irq_data *d);

void irq_gc_ack_set_bit(struct irq_data *d);

void irq_gc_ack_clr_bit(struct irq_data *d);

void irq_gc_mask_disable_reg_and_ack(struct irq_data *d);

void irq_gc_mask_disable_and_ack_set(struct irq_data *d);

void irq_gc_eoi(struct irq_data *d);

int irq_gc_set_wake(struct irq_data *d, unsigned int on);

kernel/irq/generic-chip.c

+0 −16
Original line number Diff line number Diff line
@@ -134,22 +134,6 @@ void irq_gc_ack_clr_bit(struct irq_data *d) 
	irq_gc_unlock(gc);

}



/**

 * irq_gc_mask_disable_reg_and_ack - Mask and ack pending interrupt

 * @d: irq_data

 */

void irq_gc_mask_disable_reg_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.mask);

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

	irq_gc_unlock(gc);

}



/**

 * irq_gc_mask_disable_and_ack_set - Mask and ack pending interrupt

 * @d: irq_data