Commit f1771b85 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Marc Zyngier
Browse files

irqchip/mmp: Remove non-DT codepath 



Building with "W=1" warns about missing declarations for
two functions in the mmp irqchip driver:

drivers/irqchip/irq-mmp.c:248:13: error: no previous prototype for 'icu_init_irq'
drivers/irqchip/irq-mmp.c:271:13: error: no previous prototype for 'mmp2_init_icu'

The declarations are present in an unused header, but since there is no
caller, it's best to just remove the functions and the header completely,
making the driver DT-only to match the state of the platform.

Fixes: 77acc85c ("ARM: mmp: remove device definitions")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20230516200516.554663-2-arnd@kernel.org
parent 97bb0f8e

drivers/irqchip/irq-mmp.c

+0 −127
Original line number Diff line number Diff line
@@ -244,132 +244,6 @@ static void __exception_irq_entry mmp2_handle_irq(struct pt_regs *regs) 
	generic_handle_domain_irq(icu_data[0].domain, hwirq);

}



/* MMP (ARMv5) */

void __init icu_init_irq(void)

{

	int irq;



	max_icu_nr = 1;

	mmp_icu_base = ioremap(0xd4282000, 0x1000);

	icu_data[0].conf_enable = mmp_conf.conf_enable;

	icu_data[0].conf_disable = mmp_conf.conf_disable;

	icu_data[0].conf_mask = mmp_conf.conf_mask;

	icu_data[0].nr_irqs = 64;

	icu_data[0].virq_base = 0;

	icu_data[0].domain = irq_domain_add_legacy(NULL, 64, 0, 0,

						   &irq_domain_simple_ops,

						   &icu_data[0]);

	for (irq = 0; irq < 64; irq++) {

		icu_mask_irq(irq_get_irq_data(irq));

		irq_set_chip_and_handler(irq, &icu_irq_chip, handle_level_irq);

	}

	irq_set_default_host(icu_data[0].domain);

	set_handle_irq(mmp_handle_irq);

}



/* MMP2 (ARMv7) */

void __init mmp2_init_icu(void)

{

	int irq, end;



	max_icu_nr = 8;

	mmp_icu_base = ioremap(0xd4282000, 0x1000);

	icu_data[0].conf_enable = mmp2_conf.conf_enable;

	icu_data[0].conf_disable = mmp2_conf.conf_disable;

	icu_data[0].conf_mask = mmp2_conf.conf_mask;

	icu_data[0].nr_irqs = 64;

	icu_data[0].virq_base = 0;

	icu_data[0].domain = irq_domain_add_legacy(NULL, 64, 0, 0,

						   &irq_domain_simple_ops,

						   &icu_data[0]);

	icu_data[1].reg_status = mmp_icu_base + 0x150;

	icu_data[1].reg_mask = mmp_icu_base + 0x168;

	icu_data[1].clr_mfp_irq_base = icu_data[0].virq_base +

				icu_data[0].nr_irqs;

	icu_data[1].clr_mfp_hwirq = 1;		/* offset to IRQ_MMP2_PMIC_BASE */

	icu_data[1].nr_irqs = 2;

	icu_data[1].cascade_irq = 4;

	icu_data[1].virq_base = icu_data[0].virq_base + icu_data[0].nr_irqs;

	icu_data[1].domain = irq_domain_add_legacy(NULL, icu_data[1].nr_irqs,

						   icu_data[1].virq_base, 0,

						   &irq_domain_simple_ops,

						   &icu_data[1]);

	icu_data[2].reg_status = mmp_icu_base + 0x154;

	icu_data[2].reg_mask = mmp_icu_base + 0x16c;

	icu_data[2].nr_irqs = 2;

	icu_data[2].cascade_irq = 5;

	icu_data[2].virq_base = icu_data[1].virq_base + icu_data[1].nr_irqs;

	icu_data[2].domain = irq_domain_add_legacy(NULL, icu_data[2].nr_irqs,

						   icu_data[2].virq_base, 0,

						   &irq_domain_simple_ops,

						   &icu_data[2]);

	icu_data[3].reg_status = mmp_icu_base + 0x180;

	icu_data[3].reg_mask = mmp_icu_base + 0x17c;

	icu_data[3].nr_irqs = 3;

	icu_data[3].cascade_irq = 9;

	icu_data[3].virq_base = icu_data[2].virq_base + icu_data[2].nr_irqs;

	icu_data[3].domain = irq_domain_add_legacy(NULL, icu_data[3].nr_irqs,

						   icu_data[3].virq_base, 0,

						   &irq_domain_simple_ops,

						   &icu_data[3]);

	icu_data[4].reg_status = mmp_icu_base + 0x158;

	icu_data[4].reg_mask = mmp_icu_base + 0x170;

	icu_data[4].nr_irqs = 5;

	icu_data[4].cascade_irq = 17;

	icu_data[4].virq_base = icu_data[3].virq_base + icu_data[3].nr_irqs;

	icu_data[4].domain = irq_domain_add_legacy(NULL, icu_data[4].nr_irqs,

						   icu_data[4].virq_base, 0,

						   &irq_domain_simple_ops,

						   &icu_data[4]);

	icu_data[5].reg_status = mmp_icu_base + 0x15c;

	icu_data[5].reg_mask = mmp_icu_base + 0x174;

	icu_data[5].nr_irqs = 15;

	icu_data[5].cascade_irq = 35;

	icu_data[5].virq_base = icu_data[4].virq_base + icu_data[4].nr_irqs;

	icu_data[5].domain = irq_domain_add_legacy(NULL, icu_data[5].nr_irqs,

						   icu_data[5].virq_base, 0,

						   &irq_domain_simple_ops,

						   &icu_data[5]);

	icu_data[6].reg_status = mmp_icu_base + 0x160;

	icu_data[6].reg_mask = mmp_icu_base + 0x178;

	icu_data[6].nr_irqs = 2;

	icu_data[6].cascade_irq = 51;

	icu_data[6].virq_base = icu_data[5].virq_base + icu_data[5].nr_irqs;

	icu_data[6].domain = irq_domain_add_legacy(NULL, icu_data[6].nr_irqs,

						   icu_data[6].virq_base, 0,

						   &irq_domain_simple_ops,

						   &icu_data[6]);

	icu_data[7].reg_status = mmp_icu_base + 0x188;

	icu_data[7].reg_mask = mmp_icu_base + 0x184;

	icu_data[7].nr_irqs = 2;

	icu_data[7].cascade_irq = 55;

	icu_data[7].virq_base = icu_data[6].virq_base + icu_data[6].nr_irqs;

	icu_data[7].domain = irq_domain_add_legacy(NULL, icu_data[7].nr_irqs,

						   icu_data[7].virq_base, 0,

						   &irq_domain_simple_ops,

						   &icu_data[7]);

	end = icu_data[7].virq_base + icu_data[7].nr_irqs;

	for (irq = 0; irq < end; irq++) {

		icu_mask_irq(irq_get_irq_data(irq));

		if (irq == icu_data[1].cascade_irq ||

		    irq == icu_data[2].cascade_irq ||

		    irq == icu_data[3].cascade_irq ||

		    irq == icu_data[4].cascade_irq ||

		    irq == icu_data[5].cascade_irq ||

		    irq == icu_data[6].cascade_irq ||

		    irq == icu_data[7].cascade_irq) {

			irq_set_chip(irq, &icu_irq_chip);

			irq_set_chained_handler(irq, icu_mux_irq_demux);

		} else {

			irq_set_chip_and_handler(irq, &icu_irq_chip,

						 handle_level_irq);

		}

	}

	irq_set_default_host(icu_data[0].domain);

	set_handle_irq(mmp2_handle_irq);

}



#ifdef CONFIG_OF

static int __init mmp_init_bases(struct device_node *node)

{

	int ret, nr_irqs, irq, i = 0;
@@ -548,4 +422,3 @@ static int __init mmp2_mux_of_init(struct device_node *node, 
	return -EINVAL;

}

IRQCHIP_DECLARE(mmp2_mux_intc, "mrvl,mmp2-mux-intc", mmp2_mux_of_init);
 
#endif

include/linux/irqchip/mmp.h

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef	__IRQCHIP_MMP_H

#define	__IRQCHIP_MMP_H



extern struct irq_chip icu_irq_chip;



extern void icu_init_irq(void);

extern void mmp2_init_icu(void);



#endif	/* __IRQCHIP_MMP_H */