Commit 9eaee99e authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Samuel Ortiz
Browse files

mfd: htc-i2cpld: Cleanup interrupt handling 



Remove the pointless irq_desc check in set_type. This function is
called with that irq descriptor locked. Also remove the write back of
the flow type as the core code does this already when the return value
is 0.

Also store the flow type in the chip data structure, so there is no
need to fiddle in the irq descriptor.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 77eda966

drivers/mfd/htc-i2cpld.c

+7 −18
Original line number Original line Diff line number Diff line
@@ -58,6 +58,7 @@ struct htcpld_chip { 
	uint                    irq_start;

	uint                    irq_start;

	int                     nirqs;

	int                     nirqs;





	unsigned int		flow_type;

	/*

	/*

	 * Work structure to allow for setting values outside of any

	 * Work structure to allow for setting values outside of any

	 * possible interrupt context

	 * possible interrupt context
@@ -97,12 +98,7 @@ static void htcpld_unmask(struct irq_data *data) 




static int htcpld_set_type(struct irq_data *data, unsigned int flags)

static int htcpld_set_type(struct irq_data *data, unsigned int flags)

{

{

	struct irq_desc *d = irq_to_desc(data->irq);

	struct htcpld_chip *chip = irq_data_get_irq_chip_data(data);



	if (!d) {

		pr_err("HTCPLD invalid IRQ: %d\n", data->irq);

		return -EINVAL;

	}





	if (flags & ~IRQ_TYPE_SENSE_MASK)

	if (flags & ~IRQ_TYPE_SENSE_MASK)

		return -EINVAL;

		return -EINVAL;
@@ -111,9 +107,7 @@ static int htcpld_set_type(struct irq_data *data, unsigned int flags) 
	if (flags & (IRQ_TYPE_LEVEL_LOW|IRQ_TYPE_LEVEL_HIGH))

	if (flags & (IRQ_TYPE_LEVEL_LOW|IRQ_TYPE_LEVEL_HIGH))

		return -EINVAL;

		return -EINVAL;





	d->status &= ~IRQ_TYPE_SENSE_MASK;

	chip->flow_type = flags;

	d->status |= flags;



	return 0;

	return 0;

}

}
@@ -135,7 +129,6 @@ static irqreturn_t htcpld_handler(int irq, void *dev) 
	unsigned int i;

	unsigned int i;

	unsigned long flags;

	unsigned long flags;

	int irqpin;

	int irqpin;

	struct irq_desc *desc;





	if (!htcpld) {

	if (!htcpld) {

		pr_debug("htcpld is null in ISR\n");

		pr_debug("htcpld is null in ISR\n");
@@ -195,23 +188,19 @@ static irqreturn_t htcpld_handler(int irq, void *dev) 
		 * associated interrupts.

		 * associated interrupts.

		 */

		 */

		for (irqpin = 0; irqpin < chip->nirqs; irqpin++) {

		for (irqpin = 0; irqpin < chip->nirqs; irqpin++) {

			unsigned oldb, newb;

			unsigned oldb, newb, type = chip->flow_type;

			int flags;





			irq = chip->irq_start + irqpin;

			irq = chip->irq_start + irqpin;

			desc = irq_to_desc(irq);

			flags = desc->status;





			/* Run the IRQ handler, but only if the bit value

			/* Run the IRQ handler, but only if the bit value

			 * changed, and the proper flags are set */

			 * changed, and the proper flags are set */

			oldb = (old_val >> irqpin) & 1;

			oldb = (old_val >> irqpin) & 1;

			newb = (uval >> irqpin) & 1;

			newb = (uval >> irqpin) & 1;





			if ((!oldb && newb && (flags & IRQ_TYPE_EDGE_RISING)) ||

			if ((!oldb && newb && (type & IRQ_TYPE_EDGE_RISING)) ||

			    (oldb && !newb &&

			    (oldb && !newb && (type & IRQ_TYPE_EDGE_FALLING))) {

			     (flags & IRQ_TYPE_EDGE_FALLING))) {

				pr_debug("fire IRQ %d\n", irqpin);

				pr_debug("fire IRQ %d\n", irqpin);

				desc->handle_irq(irq, desc);

				generic_handle_irq(irq);

			}

			}

		}

		}

	}

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE