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

Commit b2ba2c30 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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



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

kernel/irq/autoprobe.c

+3 −2
Original line number Diff line number Diff line
@@ -57,8 +57,9 @@ unsigned long probe_irq_on(void) 
			 * Some chips need to know about probing in

			 * progress:

			 */

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

				desc->irq_data.chip->set_type(i, IRQ_TYPE_PROBE);

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

				desc->irq_data.chip->irq_set_type(&desc->irq_data,

							 IRQ_TYPE_PROBE);

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

		}

		raw_spin_unlock_irq(&desc->lock);

kernel/irq/chip.c

+7 −0
Original line number Diff line number Diff line
@@ -376,6 +376,11 @@ static int compat_irq_set_affinity(struct irq_data *data, 
	return data->chip->set_affinity(data->irq, dest);

}



static int compat_irq_set_type(struct irq_data *data, unsigned int type)

{

	return data->chip->set_type(data->irq, type);

}



static void compat_bus_lock(struct irq_data *data)

{

	data->chip->bus_lock(data->irq);
@@ -444,6 +449,8 @@ void irq_chip_set_defaults(struct irq_chip *chip) 
		chip->irq_eoi = compat_irq_eoi;

	if (chip->set_affinity)

		chip->irq_set_affinity = compat_irq_set_affinity;

	if (chip->set_type)

		chip->irq_set_type = compat_irq_set_type;

}



static inline void mask_ack_irq(struct irq_desc *desc)

kernel/irq/manage.c

+5 −5
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned int irq, 
	int ret;

	struct irq_chip *chip = desc->irq_data.chip;



	if (!chip || !chip->set_type) {

	if (!chip || !chip->irq_set_type) {

		/*

		 * IRQF_TRIGGER_* but the PIC does not support multiple

		 * flow-types?
@@ -446,11 +446,11 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned int irq, 
	}



	/* caller masked out all except trigger mode flags */

	ret = chip->set_type(irq, flags);

	ret = chip->irq_set_type(&desc->irq_data, flags);



	if (ret)

		pr_err("setting trigger mode %d for irq %u failed (%pF)\n",

				(int)flags, irq, chip->set_type);

		pr_err("setting trigger mode %lu for irq %u failed (%pF)\n",

		       flags, irq, chip->irq_set_type);

	else {

		if (flags & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))

			flags |= IRQ_LEVEL;