Skip to content

Commit

Permalink
irqchip/atmel-aic: Remove root argument from ->fixup() prototype
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Boris Brezillon authored and Marc Zyngier committed Jul 4, 2017
1 parent 277867a commit 0a46230
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions drivers/irqchip/irq-atmel-aic-common.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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_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;
void __iomem *regs;
Expand Down Expand Up @@ -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_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;
void __iomem *regs;
Expand Down Expand Up @@ -198,8 +198,8 @@ static void __init aic_common_irq_fixup(const struct of_device_id *matches)
match = of_match_node(matches, root);

if (match) {
void (*fixup)(struct device_node *) = match->data;
fixup(root);
void (*fixup)(void) = match->data;
fixup();
}

of_node_put(root);
Expand Down
4 changes: 2 additions & 2 deletions drivers/irqchip/irq-atmel-aic-common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ struct irq_domain *__init aic_common_of_init(struct device_node *node,
const char *name, int nirqs,
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 */
14 changes: 7 additions & 7 deletions drivers/irqchip/irq-atmel-aic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,20 +209,20 @@ static const struct irq_domain_ops aic_irq_ops = {
.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_rtt_irq_fixup(root);
aic_common_rtc_irq_fixup();
aic_common_rtt_irq_fixup();
}

static const struct of_device_id aic_irq_fixups[] __initconst = {
Expand Down
4 changes: 2 additions & 2 deletions drivers/irqchip/irq-atmel-aic5.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,9 +305,9 @@ static const struct irq_domain_ops aic5_irq_ops = {
.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 = {
Expand Down

0 comments on commit 0a46230

Please sign in to comment.