History

irqdomain: Let irq_domain_set_{info,hwirq_and_chip} take a const irq_chip

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.

Marc Zyngier committed 4 years ago

Commit 45ec8461 parent beb06222 files · +8 −6Browse files

Unified · Split

2 files
  1. include/linux/irqdomain.h +3 −2
  2. kernel/irq/irqdomain.c +5 −4
include/linux/irqdomain.h+3−2
@@ -479,7 +479,8 @@ int irq_destroy_ipi(unsigned int irq, const struct cpumask *dest); · 478 unmodified lines
479extern struct irq_data *irq_domain_get_irq_data(struct irq_domain *domain,479extern struct irq_data *irq_domain_get_irq_data(struct irq_domain *domain,
480 unsigned int virq);480 unsigned int virq);
481extern void irq_domain_set_info(struct irq_domain *domain, unsigned int virq,481extern 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 void *chip_data, irq_flow_handler_t handler,484 void *chip_data, irq_flow_handler_t handler,
484 void *handler_data, const char *handler_name);485 void *handler_data, const char *handler_name);
485extern void irq_domain_reset_irq_data(struct irq_data *irq_data);486extern 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
522extern int irq_domain_set_hwirq_and_chip(struct irq_domain *domain,523extern int irq_domain_set_hwirq_and_chip(struct irq_domain *domain,
523 unsigned int virq,524 unsigned int virq,
524 irq_hw_number_t hwirq,525 irq_hw_number_t hwirq,
525 struct irq_chip *chip,526 const struct irq_chip *chip,
526 void *chip_data);527 void *chip_data);
527extern void irq_domain_free_irqs_common(struct irq_domain *domain,528extern void irq_domain_free_irqs_common(struct irq_domain *domain,
528 unsigned int virq,529 unsigned int virq,
kernel/irq/irqdomain.c+5−4
@@ -1319,7 +1319,8 @@ EXPORT_SYMBOL_GPL(irq_domain_get_irq_data); · 1318 unmodified lines
1319 * @chip_data: The associated chip data1319 * @chip_data: The associated chip data
1320 */1320 */
1321int irq_domain_set_hwirq_and_chip(struct irq_domain *domain, unsigned int virq,1321int 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 void *chip_data)1324 void *chip_data)
1324{1325{
1325 struct irq_data *irq_data = irq_domain_get_irq_data(domain, virq);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 return -ENOENT;1329 return -ENOENT;
1329 1330
1330 irq_data->hwirq = hwirq;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 irq_data->chip_data = chip_data;1333 irq_data->chip_data = chip_data;
1333 1334
1334 return 0;1335 return 0;
@@ -1347,7 +1348,7 @@ EXPORT_SYMBOL_GPL(irq_domain_set_hwirq_and_chip); · 12 unmodified lines
1347 * @handler_name: The interrupt handler name1348 * @handler_name: The interrupt handler name
1348 */1349 */
1349void irq_domain_set_info(struct irq_domain *domain, unsigned int virq,1350void 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 void *chip_data, irq_flow_handler_t handler,1352 void *chip_data, irq_flow_handler_t handler,
1352 void *handler_data, const char *handler_name)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 * @handler_name: The interrupt handler name1854 * @handler_name: The interrupt handler name
1854 */1855 */
1855void irq_domain_set_info(struct irq_domain *domain, unsigned int virq,1856void 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 void *chip_data, irq_flow_handler_t handler,1858 void *chip_data, irq_flow_handler_t handler,
1858 void *handler_data, const char *handler_name)1859 void *handler_data, const char *handler_name)
1859{1860{