Skip to content

Commit 8fa88a8

Browse files
Valentin SchneiderKAGA-KOKO
authored andcommitted
genirq: Remove preflow handler support
That was put in place for sparc64, and blackfin also used it for some time; sparc64 no longer uses those, and blackfin is dead. As there are no more users, remove preflow handlers. Signed-off-by: Valentin Schneider <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
1 parent 959f53b commit 8fa88a8

File tree

4 files changed

+0
-33
lines changed

4 files changed

+0
-33
lines changed

include/linux/irqdesc.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ struct pt_regs;
2222
* @irq_common_data: per irq and chip data passed down to chip functions
2323
* @kstat_irqs: irq stats per cpu
2424
* @handle_irq: highlevel irq-events handler
25-
* @preflow_handler: handler called before the flow handler (currently used by sparc)
2625
* @action: the irq action chain
2726
* @status_use_accessors: status information
2827
* @core_internal_state__do_not_mess_with_it: core internal status information
@@ -58,9 +57,6 @@ struct irq_desc {
5857
struct irq_data irq_data;
5958
unsigned int __percpu *kstat_irqs;
6059
irq_flow_handler_t handle_irq;
61-
#ifdef CONFIG_IRQ_PREFLOW_FASTEOI
62-
irq_preflow_handler_t preflow_handler;
63-
#endif
6460
struct irqaction *action; /* IRQ action list */
6561
unsigned int status_use_accessors;
6662
unsigned int core_internal_state__do_not_mess_with_it;
@@ -268,15 +264,4 @@ irq_set_lockdep_class(unsigned int irq, struct lock_class_key *lock_class,
268264
}
269265
}
270266

271-
#ifdef CONFIG_IRQ_PREFLOW_FASTEOI
272-
static inline void
273-
__irq_set_preflow_handler(unsigned int irq, irq_preflow_handler_t handler)
274-
{
275-
struct irq_desc *desc;
276-
277-
desc = irq_to_desc(irq);
278-
desc->preflow_handler = handler;
279-
}
280-
#endif
281-
282267
#endif

include/linux/irqhandler.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@
1010
struct irq_desc;
1111
struct irq_data;
1212
typedef void (*irq_flow_handler_t)(struct irq_desc *desc);
13-
typedef void (*irq_preflow_handler_t)(struct irq_data *data);
1413

1514
#endif

kernel/irq/Kconfig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,6 @@ config GENERIC_IRQ_INJECTION
5151
config HARDIRQS_SW_RESEND
5252
bool
5353

54-
# Preflow handler support for fasteoi (sparc64)
55-
config IRQ_PREFLOW_FASTEOI
56-
bool
57-
5854
# Edge style eoi based handler (cell)
5955
config IRQ_EDGE_EOI_HANDLER
6056
bool

kernel/irq/chip.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -656,16 +656,6 @@ void handle_level_irq(struct irq_desc *desc)
656656
}
657657
EXPORT_SYMBOL_GPL(handle_level_irq);
658658

659-
#ifdef CONFIG_IRQ_PREFLOW_FASTEOI
660-
static inline void preflow_handler(struct irq_desc *desc)
661-
{
662-
if (desc->preflow_handler)
663-
desc->preflow_handler(&desc->irq_data);
664-
}
665-
#else
666-
static inline void preflow_handler(struct irq_desc *desc) { }
667-
#endif
668-
669659
static void cond_unmask_eoi_irq(struct irq_desc *desc, struct irq_chip *chip)
670660
{
671661
if (!(desc->istate & IRQS_ONESHOT)) {
@@ -721,7 +711,6 @@ void handle_fasteoi_irq(struct irq_desc *desc)
721711
if (desc->istate & IRQS_ONESHOT)
722712
mask_irq(desc);
723713

724-
preflow_handler(desc);
725714
handle_irq_event(desc);
726715

727716
cond_unmask_eoi_irq(desc, chip);
@@ -1231,7 +1220,6 @@ void handle_fasteoi_ack_irq(struct irq_desc *desc)
12311220
/* Start handling the irq */
12321221
desc->irq_data.chip->irq_ack(&desc->irq_data);
12331222

1234-
preflow_handler(desc);
12351223
handle_irq_event(desc);
12361224

12371225
cond_unmask_eoi_irq(desc, chip);
@@ -1281,7 +1269,6 @@ void handle_fasteoi_mask_irq(struct irq_desc *desc)
12811269
if (desc->istate & IRQS_ONESHOT)
12821270
mask_irq(desc);
12831271

1284-
preflow_handler(desc);
12851272
handle_irq_event(desc);
12861273

12871274
cond_unmask_eoi_irq(desc, chip);

0 commit comments

Comments
 (0)