diff options
-rw-r--r-- | include/linux/irq.h | 1 | ||||
-rw-r--r-- | kernel/irq/generic-chip.c | 16 |
2 files changed, 0 insertions, 17 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index 494d328f7051..5ad10948ea95 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
@@ -1009,7 +1009,6 @@ void irq_gc_mask_clr_bit(struct irq_data *d); | |||
1009 | void irq_gc_unmask_enable_reg(struct irq_data *d); | 1009 | void irq_gc_unmask_enable_reg(struct irq_data *d); |
1010 | void irq_gc_ack_set_bit(struct irq_data *d); | 1010 | void irq_gc_ack_set_bit(struct irq_data *d); |
1011 | void irq_gc_ack_clr_bit(struct irq_data *d); | 1011 | void irq_gc_ack_clr_bit(struct irq_data *d); |
1012 | void irq_gc_mask_disable_reg_and_ack(struct irq_data *d); | ||
1013 | void irq_gc_mask_disable_and_ack_set(struct irq_data *d); | 1012 | void irq_gc_mask_disable_and_ack_set(struct irq_data *d); |
1014 | void irq_gc_eoi(struct irq_data *d); | 1013 | void irq_gc_eoi(struct irq_data *d); |
1015 | int irq_gc_set_wake(struct irq_data *d, unsigned int on); | 1014 | int irq_gc_set_wake(struct irq_data *d, unsigned int on); |
diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c index ec5fe9a0cb05..c26c5bb6b491 100644 --- a/kernel/irq/generic-chip.c +++ b/kernel/irq/generic-chip.c | |||
@@ -135,22 +135,6 @@ void irq_gc_ack_clr_bit(struct irq_data *d) | |||
135 | } | 135 | } |
136 | 136 | ||
137 | /** | 137 | /** |
138 | * irq_gc_mask_disable_reg_and_ack - Mask and ack pending interrupt | ||
139 | * @d: irq_data | ||
140 | */ | ||
141 | void irq_gc_mask_disable_reg_and_ack(struct irq_data *d) | ||
142 | { | ||
143 | struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d); | ||
144 | struct irq_chip_type *ct = irq_data_get_chip_type(d); | ||
145 | u32 mask = d->mask; | ||
146 | |||
147 | irq_gc_lock(gc); | ||
148 | irq_reg_writel(gc, mask, ct->regs.mask); | ||
149 | irq_reg_writel(gc, mask, ct->regs.ack); | ||
150 | irq_gc_unlock(gc); | ||
151 | } | ||
152 | |||
153 | /** | ||
154 | * irq_gc_mask_disable_and_ack_set - Mask and ack pending interrupt | 138 | * irq_gc_mask_disable_and_ack_set - Mask and ack pending interrupt |
155 | * @d: irq_data | 139 | * @d: irq_data |
156 | * | 140 | * |