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

Showing the changes to kernel (1 of 2 files). Show all

Unified · Split

kernel/irq/irqdomain.c+5−4
@@ -1319,7 +1319,8 @@ EXPORT_SYMBOL_GPL(irq_domain_get_irq_data); · 1318 unmodified lines
13191319 * @chip_data: The associated chip data
13201320 */
13211321 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,
13231324 void *chip_data)
13241325 {
13251326 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
13281329 return -ENOENT;
13291330
13301331 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);
13321333 irq_data->chip_data = chip_data;
13331334
13341335 return 0;
@@ -1347,7 +1348,7 @@ EXPORT_SYMBOL_GPL(irq_domain_set_hwirq_and_chip); · 12 unmodified lines
13471348 * @handler_name: The interrupt handler name
13481349 */
13491350 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,
13511352 void *chip_data, irq_flow_handler_t handler,
13521353 void *handler_data, const char *handler_name)
13531354 {
@@ -1853,7 +1854,7 @@ EXPORT_SYMBOL_GPL(irq_domain_get_irq_data); · 499 unmodified lines
18531854 * @handler_name: The interrupt handler name
18541855 */
18551856 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,
18571858 void *chip_data, irq_flow_handler_t handler,
18581859 void *handler_data, const char *handler_name)
18591860 {