Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6098ecb4 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

ARM: spear: Remove init_irq declaration in machine description 



Commit ebafed7a ("ARM: irq: Call irqchip_init if no init_irq function is
specified") removed the need to explictly setup the init_irq field in
the machine description when using only irqchip_init. Remove that
declaration for spear as well.

Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
parent 7df1af8d

arch/arm/mach-spear/spear1310.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ 
#define pr_fmt(fmt) "SPEAr1310: " fmt

#define pr_fmt(fmt) "SPEAr1310: " fmt





#include <linux/amba/pl022.h>

#include <linux/amba/pl022.h>

#include <linux/irqchip.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/pata_arasan_cf_data.h>

#include <linux/pata_arasan_cf_data.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>
@@ -60,7 +59,6 @@ static void __init spear1310_map_io(void) 
DT_MACHINE_START(SPEAR1310_DT, "ST SPEAr1310 SoC with Flattened Device Tree")

DT_MACHINE_START(SPEAR1310_DT, "ST SPEAr1310 SoC with Flattened Device Tree")

	.smp		=	smp_ops(spear13xx_smp_ops),

	.smp		=	smp_ops(spear13xx_smp_ops),

	.map_io		=	spear1310_map_io,

	.map_io		=	spear1310_map_io,

	.init_irq	=	irqchip_init,

	.init_time	=	spear13xx_timer_init,

	.init_time	=	spear13xx_timer_init,

	.init_machine	=	spear1310_dt_init,

	.init_machine	=	spear1310_dt_init,

	.restart	=	spear_restart,

	.restart	=	spear_restart,

arch/arm/mach-spear/spear1340.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/amba/serial.h>

#include <linux/amba/serial.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <linux/irqchip.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include "generic.h"

#include "generic.h"

#include <mach/spear.h>

#include <mach/spear.h>
@@ -155,7 +154,6 @@ static const char * const spear1340_dt_board_compat[] = { 
DT_MACHINE_START(SPEAR1340_DT, "ST SPEAr1340 SoC with Flattened Device Tree")

DT_MACHINE_START(SPEAR1340_DT, "ST SPEAr1340 SoC with Flattened Device Tree")

	.smp		=	smp_ops(spear13xx_smp_ops),

	.smp		=	smp_ops(spear13xx_smp_ops),

	.map_io		=	spear13xx_map_io,

	.map_io		=	spear13xx_map_io,

	.init_irq	=	irqchip_init,

	.init_time	=	spear13xx_timer_init,

	.init_time	=	spear13xx_timer_init,

	.init_machine	=	spear1340_dt_init,

	.init_machine	=	spear1340_dt_init,

	.restart	=	spear_restart,

	.restart	=	spear_restart,

arch/arm/mach-spear/spear300.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -14,7 +14,6 @@ 
#define pr_fmt(fmt) "SPEAr300: " fmt

#define pr_fmt(fmt) "SPEAr300: " fmt





#include <linux/amba/pl08x.h>

#include <linux/amba/pl08x.h>

#include <linux/irqchip.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include "generic.h"

#include "generic.h"
@@ -212,7 +211,6 @@ static void __init spear300_map_io(void) 




DT_MACHINE_START(SPEAR300_DT, "ST SPEAr300 SoC with Flattened Device Tree")

DT_MACHINE_START(SPEAR300_DT, "ST SPEAr300 SoC with Flattened Device Tree")

	.map_io		=	spear300_map_io,

	.map_io		=	spear300_map_io,

	.init_irq	=	irqchip_init,

	.init_time	=	spear3xx_timer_init,

	.init_time	=	spear3xx_timer_init,

	.init_machine	=	spear300_dt_init,

	.init_machine	=	spear300_dt_init,

	.restart	=	spear_restart,

	.restart	=	spear_restart,

arch/arm/mach-spear/spear310.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -15,7 +15,6 @@ 




#include <linux/amba/pl08x.h>

#include <linux/amba/pl08x.h>

#include <linux/amba/serial.h>

#include <linux/amba/serial.h>

#include <linux/irqchip.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include "generic.h"

#include "generic.h"
@@ -254,7 +253,6 @@ static void __init spear310_map_io(void) 




DT_MACHINE_START(SPEAR310_DT, "ST SPEAr310 SoC with Flattened Device Tree")

DT_MACHINE_START(SPEAR310_DT, "ST SPEAr310 SoC with Flattened Device Tree")

	.map_io		=	spear310_map_io,

	.map_io		=	spear310_map_io,

	.init_irq	=	irqchip_init,

	.init_time	=	spear3xx_timer_init,

	.init_time	=	spear3xx_timer_init,

	.init_machine	=	spear310_dt_init,

	.init_machine	=	spear310_dt_init,

	.restart	=	spear_restart,

	.restart	=	spear_restart,

arch/arm/mach-spear/spear320.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/amba/pl022.h>

#include <linux/amba/pl022.h>

#include <linux/amba/pl08x.h>

#include <linux/amba/pl08x.h>

#include <linux/amba/serial.h>

#include <linux/amba/serial.h>

#include <linux/irqchip.h>

#include <linux/of_platform.h>

#include <linux/of_platform.h>

#include <asm/mach/arch.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/map.h>
@@ -269,7 +268,6 @@ static void __init spear320_map_io(void) 




DT_MACHINE_START(SPEAR320_DT, "ST SPEAr320 SoC with Flattened Device Tree")

DT_MACHINE_START(SPEAR320_DT, "ST SPEAr320 SoC with Flattened Device Tree")

	.map_io		=	spear320_map_io,

	.map_io		=	spear320_map_io,

	.init_irq	=	irqchip_init,

	.init_time	=	spear3xx_timer_init,

	.init_time	=	spear3xx_timer_init,

	.init_machine	=	spear320_dt_init,

	.init_machine	=	spear320_dt_init,

	.restart	=	spear_restart,

	.restart	=	spear_restart,