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>
This commit is contained in:
parent
277867ade8
commit
0a46230bf0
|
@ -137,7 +137,7 @@ static void __init aic_common_ext_irq_of_init(struct irq_domain *domain)
|
||||||
#define AT91_RTC_IMR 0x28
|
#define AT91_RTC_IMR 0x28
|
||||||
#define AT91_RTC_IRQ_MASK 0x1f
|
#define AT91_RTC_IRQ_MASK 0x1f
|
||||||
|
|
||||||
void __init aic_common_rtc_irq_fixup(struct device_node *root)
|
void __init aic_common_rtc_irq_fixup(void)
|
||||||
{
|
{
|
||||||
struct device_node *np;
|
struct device_node *np;
|
||||||
void __iomem *regs;
|
void __iomem *regs;
|
||||||
|
@ -165,7 +165,7 @@ void __init aic_common_rtc_irq_fixup(struct device_node *root)
|
||||||
#define AT91_RTT_ALMIEN (1 << 16) /* Alarm Interrupt Enable */
|
#define AT91_RTT_ALMIEN (1 << 16) /* Alarm Interrupt Enable */
|
||||||
#define AT91_RTT_RTTINCIEN (1 << 17) /* Real Time Timer Increment Interrupt Enable */
|
#define AT91_RTT_RTTINCIEN (1 << 17) /* Real Time Timer Increment Interrupt Enable */
|
||||||
|
|
||||||
void __init aic_common_rtt_irq_fixup(struct device_node *root)
|
void __init aic_common_rtt_irq_fixup(void)
|
||||||
{
|
{
|
||||||
struct device_node *np;
|
struct device_node *np;
|
||||||
void __iomem *regs;
|
void __iomem *regs;
|
||||||
|
@ -198,8 +198,8 @@ static void __init aic_common_irq_fixup(const struct of_device_id *matches)
|
||||||
match = of_match_node(matches, root);
|
match = of_match_node(matches, root);
|
||||||
|
|
||||||
if (match) {
|
if (match) {
|
||||||
void (*fixup)(struct device_node *) = match->data;
|
void (*fixup)(void) = match->data;
|
||||||
fixup(root);
|
fixup();
|
||||||
}
|
}
|
||||||
|
|
||||||
of_node_put(root);
|
of_node_put(root);
|
||||||
|
|
|
@ -33,8 +33,8 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node,
|
||||||
const char *name, int nirqs,
|
const char *name, int nirqs,
|
||||||
const struct of_device_id *matches);
|
const struct of_device_id *matches);
|
||||||
|
|
||||||
void __init aic_common_rtc_irq_fixup(struct device_node *root);
|
void __init aic_common_rtc_irq_fixup(void);
|
||||||
|
|
||||||
void __init aic_common_rtt_irq_fixup(struct device_node *root);
|
void __init aic_common_rtt_irq_fixup(void);
|
||||||
|
|
||||||
#endif /* __IRQ_ATMEL_AIC_COMMON_H */
|
#endif /* __IRQ_ATMEL_AIC_COMMON_H */
|
||||||
|
|
|
@ -209,20 +209,20 @@ static const struct irq_domain_ops aic_irq_ops = {
|
||||||
.xlate = aic_irq_domain_xlate,
|
.xlate = aic_irq_domain_xlate,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void __init at91rm9200_aic_irq_fixup(struct device_node *root)
|
static void __init at91rm9200_aic_irq_fixup(void)
|
||||||
{
|
{
|
||||||
aic_common_rtc_irq_fixup(root);
|
aic_common_rtc_irq_fixup();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init at91sam9260_aic_irq_fixup(struct device_node *root)
|
static void __init at91sam9260_aic_irq_fixup(void)
|
||||||
{
|
{
|
||||||
aic_common_rtt_irq_fixup(root);
|
aic_common_rtt_irq_fixup();
|
||||||
}
|
}
|
||||||
|
|
||||||
static void __init at91sam9g45_aic_irq_fixup(struct device_node *root)
|
static void __init at91sam9g45_aic_irq_fixup(void)
|
||||||
{
|
{
|
||||||
aic_common_rtc_irq_fixup(root);
|
aic_common_rtc_irq_fixup();
|
||||||
aic_common_rtt_irq_fixup(root);
|
aic_common_rtt_irq_fixup();
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct of_device_id aic_irq_fixups[] __initconst = {
|
static const struct of_device_id aic_irq_fixups[] __initconst = {
|
||||||
|
|
|
@ -305,9 +305,9 @@ static const struct irq_domain_ops aic5_irq_ops = {
|
||||||
.xlate = aic5_irq_domain_xlate,
|
.xlate = aic5_irq_domain_xlate,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void __init sama5d3_aic_irq_fixup(struct device_node *root)
|
static void __init sama5d3_aic_irq_fixup(void)
|
||||||
{
|
{
|
||||||
aic_common_rtc_irq_fixup(root);
|
aic_common_rtc_irq_fixup();
|
||||||
}
|
}
|
||||||
|
|
||||||
static const struct of_device_id aic5_irq_fixups[] __initconst = {
|
static const struct of_device_id aic5_irq_fixups[] __initconst = {
|
||||||
|
|
Loading…
Reference in New Issue