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

Commit 00b992de authored by Alexander Kuleshov's avatar Alexander Kuleshov Committed by Thomas Gleixner
Browse files

genirq: No need to mask non trigger mode flags before __irq_set_trigger() 



Some callers of __irq_set_trigger() masks all flags except trigger mode
flags. This is unnecessary, ase __irq_set_trigger() already does this
before usage of flags.

[ tglx: Moved the flag mask and adjusted comment. Removed the hunk in
  	enable_percpu_irq() as it is required there ]

Signed-off-by: default avatarAlexander Kuleshov <kuleshovmail@gmail.com>
Link: http://lkml.kernel.org/r/20160719095408.13778-1-kuleshovmail@gmail.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 545d5d65

kernel/irq/chip.c

+0 −1
Original line number Diff line number Diff line
@@ -76,7 +76,6 @@ int irq_set_irq_type(unsigned int irq, unsigned int type) 
	if (!desc)

		return -EINVAL;



	type &= IRQ_TYPE_SENSE_MASK;

	ret = __irq_set_trigger(desc, type);

	irq_put_desc_busunlock(desc, flags);

	return ret;

kernel/irq/manage.c

+2 −3
Original line number Diff line number Diff line
@@ -669,8 +669,6 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned long flags) 
		return 0;

	}



	flags &= IRQ_TYPE_SENSE_MASK;



	if (chip->flags & IRQCHIP_SET_TYPE_MASKED) {

		if (!irqd_irq_masked(&desc->irq_data))

			mask_irq(desc);
@@ -678,7 +676,8 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned long flags) 
			unmask = 1;

	}



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

	/* Mask all flags except trigger mode */

	flags &= IRQ_TYPE_SENSE_MASK;

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



	switch (ret) {