In order to let a const irqchip be fed to the irqchip layer, adjust the various prototypes. An extra cast in irq_domain_set_hwirq_and_chip() is required to avoid a warning.
Unified · Split
| @@ -479,7 +479,8 @@ int irq_destroy_ipi(unsigned int irq, const struct cpumask *dest); · 478 unmodified lines | ||
| 479 | 479 | extern struct irq_data *irq_domain_get_irq_data(struct irq_domain *domain, |
| 480 | 480 | unsigned int virq); |
| 481 | 481 | extern void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, |
| 482 | − irq_hw_number_t hwirq, struct irq_chip *chip, | |
| 482 | + irq_hw_number_t hwirq, | |
| 483 | + const struct irq_chip *chip, | |
| 483 | 484 | void *chip_data, irq_flow_handler_t handler, |
| 484 | 485 | void *handler_data, const char *handler_name); |
| 485 | 486 | extern void irq_domain_reset_irq_data(struct irq_data *irq_data); |
| @@ -522,7 +523,7 @@ extern int irq_domain_alloc_irqs_hierarchy(struct irq_domain *domain, · 36 unmodified lines | ||
| 522 | 523 | extern int irq_domain_set_hwirq_and_chip(struct irq_domain *domain, |
| 523 | 524 | unsigned int virq, |
| 524 | 525 | irq_hw_number_t hwirq, |
| 525 | − struct irq_chip *chip, | |
| 526 | + const struct irq_chip *chip, | |
| 526 | 527 | void *chip_data); |
| 527 | 528 | extern void irq_domain_free_irqs_common(struct irq_domain *domain, |
| 528 | 529 | unsigned int virq, |
| @@ -1319,7 +1319,8 @@ EXPORT_SYMBOL_GPL(irq_domain_get_irq_data); · 1318 unmodified lines | ||
| 1319 | 1319 | * @chip_data: The associated chip data |
| 1320 | 1320 | */ |
| 1321 | 1321 | int irq_domain_set_hwirq_and_chip(struct irq_domain *domain, unsigned int virq, |
| 1322 | − irq_hw_number_t hwirq, struct irq_chip *chip, | |
| 1322 | + irq_hw_number_t hwirq, | |
| 1323 | + const struct irq_chip *chip, | |
| 1323 | 1324 | void *chip_data) |
| 1324 | 1325 | { |
| 1325 | 1326 | struct irq_data *irq_data = irq_domain_get_irq_data(domain, virq); |
| @@ -1328,7 +1329,7 @@ int irq_domain_set_hwirq_and_chip(struct irq_domain *domain, unsigned int virq, · 2 unmodified lines | ||
| 1328 | 1329 | return -ENOENT; |
| 1329 | 1330 | |
| 1330 | 1331 | irq_data->hwirq = hwirq; |
| 1331 | − irq_data->chip = chip ? chip : &no_irq_chip; | |
| 1332 | + irq_data->chip = (struct irq_chip *)(chip ? chip : &no_irq_chip); | |
| 1332 | 1333 | irq_data->chip_data = chip_data; |
| 1333 | 1334 | |
| 1334 | 1335 | return 0; |
| @@ -1347,7 +1348,7 @@ EXPORT_SYMBOL_GPL(irq_domain_set_hwirq_and_chip); · 12 unmodified lines | ||
| 1347 | 1348 | * @handler_name: The interrupt handler name |
| 1348 | 1349 | */ |
| 1349 | 1350 | void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, |
| 1350 | − irq_hw_number_t hwirq, struct irq_chip *chip, | |
| 1351 | + irq_hw_number_t hwirq, const struct irq_chip *chip, | |
| 1351 | 1352 | void *chip_data, irq_flow_handler_t handler, |
| 1352 | 1353 | void *handler_data, const char *handler_name) |
| 1353 | 1354 | { |
| @@ -1853,7 +1854,7 @@ EXPORT_SYMBOL_GPL(irq_domain_get_irq_data); · 499 unmodified lines | ||
| 1853 | 1854 | * @handler_name: The interrupt handler name |
| 1854 | 1855 | */ |
| 1855 | 1856 | void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, |
| 1856 | − irq_hw_number_t hwirq, struct irq_chip *chip, | |
| 1857 | + irq_hw_number_t hwirq, const struct irq_chip *chip, | |
| 1857 | 1858 | void *chip_data, irq_flow_handler_t handler, |
| 1858 | 1859 | void *handler_data, const char *handler_name) |
| 1859 | 1860 | { |