genirq: no need to mask non trigger mode flags before __irq_set_trigger()
PATCH 1/1 genirq: no need to mask non trigger mode flags before __irq_set_trigger()
Some callers of __irq_set_trigger() masks all flags besides trigger mode flags. Actually it is unnecessary operation now, because the __irq_set_trigger() already does this before usage of flags.
Signed-off-by Alexander Kuleshov <[email protected]>
--- kernel/irq/chip.c | 1 - kernel/irq/manage.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-)
kernel/irq/chip.c +0 -1
@@ -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
@@ -662,7 +662,7 @@ int __irq_set_trigger(struct irq_desc *desc, unsigned long flags) unmask =1 ; } -/* caller masked out all except trigger mode flags */ +/* all flags except trigger mode flags are masked */ ret = chip->irq_set_type (&desc->irq_data, flags);switch (ret) {
@@ -1730,8 +1730,7 @@ void enable_percpu_irq(unsigned int irq, unsigned int type)if (!desc)return ; - type &=IRQ_TYPE_SENSE_MASK ; -if (type !=IRQ_TYPE_NONE ) { +if (type &IRQ_TYPE_SENSE_MASK ) {int ret; ret =__irq_set_trigger (desc, type);
Signature · 1 line
2.8.0.rc3.922.g2bcc146
tip-bot for Alexander Kuleshov
merge bot[tip:irq/core] genirq: No need to mask non trigger mode flags before __irq_set_trigger()
genirq: No need to mask non trigger mode flags before __irq_set_trigger()
Commit-ID: 00b992deaa08495ab958da5950c9ebbba27d0ddc Gitweb: http://git.kernel.org/tip/00b992deaa08495ab958da5950c9ebbba27d0ddc Author: Alexander Kuleshov <[email protected]> AuthorDate: Tue, 19 Jul 2016 15:54:08 +0600 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 6 Sep 2016 12:14:12 +0200
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 Alexander Kuleshov <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
--- kernel/irq/chip.c | 1 - kernel/irq/manage.c | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-)
kernel/irq/chip.c +0 -1
@@ -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
@@ -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) {