Skip to content

Commit bfc0c5b

Browse files
jhovoldKAGA-KOKO
authored andcommitted
irqchip/irq-bcm7120-l2: Fix section mismatch
Platform drivers can be probed after their init sections have been discarded so the irqchip init callbacks must not live in init. Fixes: 3ac268d ("irqchip/irq-bcm7120-l2: Switch to IRQCHIP_PLATFORM_DRIVER") Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
1 parent e9db533 commit bfc0c5b

1 file changed

Lines changed: 6 additions & 11 deletions

File tree

drivers/irqchip/irq-bcm7120-l2.c

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -143,8 +143,7 @@ static int bcm7120_l2_intc_init_one(struct device_node *dn,
143143
return 0;
144144
}
145145

146-
static int __init bcm7120_l2_intc_iomap_7120(struct device_node *dn,
147-
struct bcm7120_l2_intc_data *data)
146+
static int bcm7120_l2_intc_iomap_7120(struct device_node *dn, struct bcm7120_l2_intc_data *data)
148147
{
149148
int ret;
150149

@@ -177,8 +176,7 @@ static int __init bcm7120_l2_intc_iomap_7120(struct device_node *dn,
177176
return 0;
178177
}
179178

180-
static int __init bcm7120_l2_intc_iomap_3380(struct device_node *dn,
181-
struct bcm7120_l2_intc_data *data)
179+
static int bcm7120_l2_intc_iomap_3380(struct device_node *dn, struct bcm7120_l2_intc_data *data)
182180
{
183181
unsigned int gc_idx;
184182

@@ -208,10 +206,9 @@ static int __init bcm7120_l2_intc_iomap_3380(struct device_node *dn,
208206
return 0;
209207
}
210208

211-
static int __init bcm7120_l2_intc_probe(struct device_node *dn,
212-
struct device_node *parent,
209+
static int bcm7120_l2_intc_probe(struct device_node *dn, struct device_node *parent,
213210
int (*iomap_regs_fn)(struct device_node *,
214-
struct bcm7120_l2_intc_data *),
211+
struct bcm7120_l2_intc_data *),
215212
const char *intc_name)
216213
{
217214
unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN;
@@ -339,15 +336,13 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn,
339336
return ret;
340337
}
341338

342-
static int __init bcm7120_l2_intc_probe_7120(struct device_node *dn,
343-
struct device_node *parent)
339+
static int bcm7120_l2_intc_probe_7120(struct device_node *dn, struct device_node *parent)
344340
{
345341
return bcm7120_l2_intc_probe(dn, parent, bcm7120_l2_intc_iomap_7120,
346342
"BCM7120 L2");
347343
}
348344

349-
static int __init bcm7120_l2_intc_probe_3380(struct device_node *dn,
350-
struct device_node *parent)
345+
static int bcm7120_l2_intc_probe_3380(struct device_node *dn, struct device_node *parent)
351346
{
352347
return bcm7120_l2_intc_probe(dn, parent, bcm7120_l2_intc_iomap_3380,
353348
"BCM3380 L2");

0 commit comments

Comments
 (0)