Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

irqchip/atmel-aic: Remove root argument from ->fixup() prototype

We are no longer using the root argument passed to the ->fixup() hooks.
Remove it.

Signed-off-by: Boris Brezillon <boris.brezillon@free-electrons.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>

authored by

Boris Brezillon and committed by
Marc Zyngier
0a46230b 277867ad

+15 -15
+4 -4
drivers/irqchip/irq-atmel-aic-common.c
··· 137 137 #define AT91_RTC_IMR 0x28 138 138 #define AT91_RTC_IRQ_MASK 0x1f 139 139 140 - void __init aic_common_rtc_irq_fixup(struct device_node *root) 140 + void __init aic_common_rtc_irq_fixup(void) 141 141 { 142 142 struct device_node *np; 143 143 void __iomem *regs; ··· 165 165 #define AT91_RTT_ALMIEN (1 << 16) /* Alarm Interrupt Enable */ 166 166 #define AT91_RTT_RTTINCIEN (1 << 17) /* Real Time Timer Increment Interrupt Enable */ 167 167 168 - void __init aic_common_rtt_irq_fixup(struct device_node *root) 168 + void __init aic_common_rtt_irq_fixup(void) 169 169 { 170 170 struct device_node *np; 171 171 void __iomem *regs; ··· 198 198 match = of_match_node(matches, root); 199 199 200 200 if (match) { 201 - void (*fixup)(struct device_node *) = match->data; 202 - fixup(root); 201 + void (*fixup)(void) = match->data; 202 + fixup(); 203 203 } 204 204 205 205 of_node_put(root);
+2 -2
drivers/irqchip/irq-atmel-aic-common.h
··· 33 33 const char *name, int nirqs, 34 34 const struct of_device_id *matches); 35 35 36 - void __init aic_common_rtc_irq_fixup(struct device_node *root); 36 + void __init aic_common_rtc_irq_fixup(void); 37 37 38 - void __init aic_common_rtt_irq_fixup(struct device_node *root); 38 + void __init aic_common_rtt_irq_fixup(void); 39 39 40 40 #endif /* __IRQ_ATMEL_AIC_COMMON_H */
+7 -7
drivers/irqchip/irq-atmel-aic.c
··· 209 209 .xlate = aic_irq_domain_xlate, 210 210 }; 211 211 212 - static void __init at91rm9200_aic_irq_fixup(struct device_node *root) 212 + static void __init at91rm9200_aic_irq_fixup(void) 213 213 { 214 - aic_common_rtc_irq_fixup(root); 214 + aic_common_rtc_irq_fixup(); 215 215 } 216 216 217 - static void __init at91sam9260_aic_irq_fixup(struct device_node *root) 217 + static void __init at91sam9260_aic_irq_fixup(void) 218 218 { 219 - aic_common_rtt_irq_fixup(root); 219 + aic_common_rtt_irq_fixup(); 220 220 } 221 221 222 - static void __init at91sam9g45_aic_irq_fixup(struct device_node *root) 222 + static void __init at91sam9g45_aic_irq_fixup(void) 223 223 { 224 - aic_common_rtc_irq_fixup(root); 225 - aic_common_rtt_irq_fixup(root); 224 + aic_common_rtc_irq_fixup(); 225 + aic_common_rtt_irq_fixup(); 226 226 } 227 227 228 228 static const struct of_device_id aic_irq_fixups[] __initconst = {
+2 -2
drivers/irqchip/irq-atmel-aic5.c
··· 305 305 .xlate = aic5_irq_domain_xlate, 306 306 }; 307 307 308 - static void __init sama5d3_aic_irq_fixup(struct device_node *root) 308 + static void __init sama5d3_aic_irq_fixup(void) 309 309 { 310 - aic_common_rtc_irq_fixup(root); 310 + aic_common_rtc_irq_fixup(); 311 311 } 312 312 313 313 static const struct of_device_id aic5_irq_fixups[] __initconst = {