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

Commit 22a49163 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

genirq: Provide compat handling for chip->ack() 



Wrap the old chip function ack() until the migration is complete and
the old chip functions are removed.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
LKML-Reference: <20100927121842.142624725@linutronix.de>
Reviewed-by: default avatarH. Peter Anvin <hpa@zytor.com>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
parent 0eda58b7

kernel/irq/chip.c

+12 −8
Original line number Diff line number Diff line
@@ -335,6 +335,11 @@ static void compat_irq_unmask(struct irq_data *data) 
	data->chip->unmask(data->irq);

}



static void compat_irq_ack(struct irq_data *data)

{

	data->chip->ack(data->irq);

}



static void compat_bus_lock(struct irq_data *data)

{

	data->chip->bus_lock(data->irq);
@@ -372,12 +377,12 @@ void irq_chip_set_defaults(struct irq_chip *chip) 
		chip->irq_bus_lock = compat_bus_lock;

	if (chip->bus_sync_unlock)

		chip->irq_bus_sync_unlock = compat_bus_sync_unlock;



	if (chip->mask)

		chip->irq_mask = compat_irq_mask;



	if (chip->unmask)

		chip->irq_unmask = compat_irq_unmask;

	if (chip->ack)

		chip->irq_ack = compat_irq_ack;

}



static inline void mask_ack_irq(struct irq_desc *desc, int irq)
@@ -386,8 +391,8 @@ static inline void mask_ack_irq(struct irq_desc *desc, int irq) 
		desc->irq_data.chip->mask_ack(irq);

	else {

		desc->irq_data.chip->irq_mask(&desc->irq_data);

		if (desc->irq_data.chip->ack)

			desc->irq_data.chip->ack(irq);

		if (desc->irq_data.chip->irq_ack)

			desc->irq_data.chip->irq_ack(&desc->irq_data);

	}

	desc->status |= IRQ_MASKED;

}
@@ -626,8 +631,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc) 
	kstat_incr_irqs_this_cpu(irq, desc);



	/* Start handling the irq */

	if (desc->irq_data.chip->ack)

		desc->irq_data.chip->ack(irq);

	desc->irq_data.chip->irq_ack(&desc->irq_data);



	/* Mark the IRQ currently in progress.*/

	desc->status |= IRQ_INPROGRESS;
@@ -680,8 +684,8 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc) 


	kstat_incr_irqs_this_cpu(irq, desc);



	if (desc->irq_data.chip->ack)

		desc->irq_data.chip->ack(irq);

	if (desc->irq_data.chip->irq_ack)

		desc->irq_data.chip->irq_ack(&desc->irq_data);



	action_ret = handle_IRQ_event(irq, desc->action);

	if (!noirqdebug)

kernel/irq/handle.c

+0 −10
Original line number Diff line number Diff line
@@ -299,14 +299,6 @@ static void ack_bad(struct irq_data *data) 
	ack_bad_irq(data->irq);

}



static void compat_ack_bad(unsigned int irq)

{

	struct irq_desc *desc = irq_to_desc(irq);



	print_irq_desc(irq, desc);

	ack_bad_irq(irq);

}



/*

 * NOP functions

 */
@@ -338,7 +330,6 @@ struct irq_chip no_irq_chip = { 
	.shutdown	= compat_noop,

	.enable		= compat_noop,

	.disable	= compat_noop,

	.ack		= compat_ack_bad,

	.end		= compat_noop,

};
@@ -359,7 +350,6 @@ struct irq_chip dummy_irq_chip = { 
	.shutdown	= compat_noop,

	.enable		= compat_noop,

	.disable	= compat_noop,

	.ack		= compat_noop,

	.end		= compat_noop,

};