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

Commit 0eda58b7 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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



Wrap the old chip function unmask() 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.043608928@linutronix.de>
Reviewed-by: default avatarH. Peter Anvin <hpa@zytor.com>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
parent e2c0f8ff

kernel/irq/chip.c

+14 −6
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static void default_enable(unsigned int irq) 
{

	struct irq_desc *desc = irq_to_desc(irq);



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

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

	desc->status &= ~IRQ_MASKED;

}
@@ -330,6 +330,11 @@ static void compat_irq_mask(struct irq_data *data) 
	data->chip->mask(data->irq);

}



static void compat_irq_unmask(struct irq_data *data)

{

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

}



static void compat_bus_lock(struct irq_data *data)

{

	data->chip->bus_lock(data->irq);
@@ -370,6 +375,9 @@ void irq_chip_set_defaults(struct irq_chip *chip) 


	if (chip->mask)

		chip->irq_mask = compat_irq_mask;



	if (chip->unmask)

		chip->irq_unmask = compat_irq_unmask;

}



static inline void mask_ack_irq(struct irq_desc *desc, int irq)
@@ -392,10 +400,10 @@ static inline void mask_irq(struct irq_desc *desc) 
	}

}



static inline void unmask_irq(struct irq_desc *desc, int irq)

static inline void unmask_irq(struct irq_desc *desc)

{

	if (desc->irq_data.chip->unmask) {

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

	if (desc->irq_data.chip->irq_unmask) {

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

		desc->status &= ~IRQ_MASKED;

	}

}
@@ -524,7 +532,7 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc) 
	desc->status &= ~IRQ_INPROGRESS;



	if (!(desc->status & (IRQ_DISABLED | IRQ_ONESHOT)))

		unmask_irq(desc, irq);

		unmask_irq(desc);

out_unlock:

	raw_spin_unlock(&desc->lock);

}
@@ -641,7 +649,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc) 
		if (unlikely((desc->status &

			       (IRQ_PENDING | IRQ_MASKED | IRQ_DISABLED)) ==

			      (IRQ_PENDING | IRQ_MASKED))) {

			unmask_irq(desc, irq);

			unmask_irq(desc);

		}



		desc->status &= ~IRQ_PENDING;

kernel/irq/handle.c

+0 −1
Original line number Diff line number Diff line
@@ -360,7 +360,6 @@ struct irq_chip dummy_irq_chip = { 
	.enable		= compat_noop,

	.disable	= compat_noop,

	.ack		= compat_noop,

	.unmask		= compat_noop,

	.end		= compat_noop,

};

kernel/irq/manage.c

+1 −1
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ static void irq_finalize_oneshot(unsigned int irq, struct irq_desc *desc) 


	if (!(desc->status & IRQ_DISABLED) && (desc->status & IRQ_MASKED)) {

		desc->status &= ~IRQ_MASKED;

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

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

	}

	raw_spin_unlock_irq(&desc->lock);

	chip_bus_sync_unlock(desc);

kernel/irq/migration.c

+1 −1
Original line number Diff line number Diff line
@@ -63,6 +63,6 @@ void move_native_irq(int irq) 


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

	move_masked_irq(irq);

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

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

}