|
@@ -1341,12 +1341,12 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
|
|
|
|
|
|
} else if (new->flags & IRQF_TRIGGER_MASK) {
|
|
} else if (new->flags & IRQF_TRIGGER_MASK) {
|
|
unsigned int nmsk = new->flags & IRQF_TRIGGER_MASK;
|
|
unsigned int nmsk = new->flags & IRQF_TRIGGER_MASK;
|
|
- unsigned int omsk = irq_settings_get_trigger_mask(desc);
|
|
|
|
|
|
+ unsigned int omsk = irqd_get_trigger_type(&desc->irq_data);
|
|
|
|
|
|
if (nmsk != omsk)
|
|
if (nmsk != omsk)
|
|
/* hope the handler works with current trigger mode */
|
|
/* hope the handler works with current trigger mode */
|
|
pr_warn("irq %d uses trigger mode %u; requested %u\n",
|
|
pr_warn("irq %d uses trigger mode %u; requested %u\n",
|
|
- irq, nmsk, omsk);
|
|
|
|
|
|
+ irq, omsk, nmsk);
|
|
}
|
|
}
|
|
|
|
|
|
*old_ptr = new;
|
|
*old_ptr = new;
|