|
@@ -752,13 +752,13 @@ static int gic_irq_domain_map(struct irq_domain *d, unsigned int irq,
|
|
irq_set_percpu_devid(irq);
|
|
irq_set_percpu_devid(irq);
|
|
irq_domain_set_info(d, irq, hw, chip, d->host_data,
|
|
irq_domain_set_info(d, irq, hw, chip, d->host_data,
|
|
handle_percpu_devid_irq, NULL, NULL);
|
|
handle_percpu_devid_irq, NULL, NULL);
|
|
- set_irq_flags(irq, IRQF_VALID | IRQF_NOAUTOEN);
|
|
|
|
|
|
+ irq_set_status_flags(irq, IRQ_NOAUTOEN);
|
|
}
|
|
}
|
|
/* SPIs */
|
|
/* SPIs */
|
|
if (hw >= 32 && hw < gic_data.irq_nr) {
|
|
if (hw >= 32 && hw < gic_data.irq_nr) {
|
|
irq_domain_set_info(d, irq, hw, chip, d->host_data,
|
|
irq_domain_set_info(d, irq, hw, chip, d->host_data,
|
|
handle_fasteoi_irq, NULL, NULL);
|
|
handle_fasteoi_irq, NULL, NULL);
|
|
- set_irq_flags(irq, IRQF_VALID | IRQF_PROBE);
|
|
|
|
|
|
+ irq_set_probe(irq);
|
|
}
|
|
}
|
|
/* LPIs */
|
|
/* LPIs */
|
|
if (hw >= 8192 && hw < GIC_ID_NR) {
|
|
if (hw >= 8192 && hw < GIC_ID_NR) {
|
|
@@ -766,7 +766,6 @@ static int gic_irq_domain_map(struct irq_domain *d, unsigned int irq,
|
|
return -EPERM;
|
|
return -EPERM;
|
|
irq_domain_set_info(d, irq, hw, chip, d->host_data,
|
|
irq_domain_set_info(d, irq, hw, chip, d->host_data,
|
|
handle_fasteoi_irq, NULL, NULL);
|
|
handle_fasteoi_irq, NULL, NULL);
|
|
- set_irq_flags(irq, IRQF_VALID);
|
|
|
|
}
|
|
}
|
|
|
|
|
|
return 0;
|
|
return 0;
|