diff options
| author | Alexander Kuleshov <kuleshovmail@gmail.com> | 2016-07-19 15:54:08 +0600 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-09-06 12:14:12 +0200 |
| commit | 00b992deaa08495ab958da5950c9ebbba27d0ddc (patch) | |
| tree | 656ac41e2df2a59485dcdeb89b24445c4d6189c4 /kernel/irq | |
| parent | 545d5d657b720e9c4dc773265bb7e9d88e34b269 (diff) | |
| download | op-kernel-dev-00b992deaa08495ab958da5950c9ebbba27d0ddc.zip op-kernel-dev-00b992deaa08495ab958da5950c9ebbba27d0ddc.tar.gz | |
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 <kuleshovmail@gmail.com>
Link: http://lkml.kernel.org/r/20160719095408.13778-1-kuleshovmail@gmail.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/irq')
| -rw-r--r-- | kernel/irq/chip.c | 1 | ||||
| -rw-r--r-- | kernel/irq/manage.c | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 93c373a..e11e8af 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -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; diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 73a2b78..4908617 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -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) { |
