2013-05-13 09:44:33

by Maxime Ripard

[permalink] [raw]
Subject: [PATCH 00/14] Cleanup irqchip_init calls

Hi everyone,

This is a splitted up version of the patch I previously sent to
remove the explicit declaration of irqchip_init as the init_irq callback in
the machine descriptions.

Since it was a pretty tricky patch to merge, since it was touching a lot of
different platforms, I splitted it for each platforms, and rebased it on top
of 3.10-rc1.

Thanks,
Maxime

Maxime Ripard (14):
ARM: sunxi: Remove init_irq declaration in machine description
ARM: zynq: Remove init_irq declaration in machine description
ARM: nomadik: Remove init_irq declaration in machine description
ARM: picoxcell: Remove init_irq declaration in machine description
ARM: shmobile: Remove init_irq declaration in machine description
ARM: bcm281xx: Remove init_irq declaration in machine description
ARM: spear: Remove init_irq declaration in machine description
ARM: msm: Remove init_irq declaration in machine description
ARM: mvebu: Remove init_irq declaration in machine description
ARM: mxs: Remove init_irq declaration in machine description
ARM: sirf: Remove init_irq declaration in machine description
ARM: vexpress: Remove init_irq declaration in machine description
ARM: virt: Remove init_irq declaration in machine description
ARM: vt8500: Remove init_irq declaration in machine description

arch/arm/mach-bcm/board_bcm.c | 1 -
arch/arm/mach-msm/board-dt-8660.c | 1 -
arch/arm/mach-msm/board-dt-8960.c | 1 -
arch/arm/mach-mvebu/armada-370-xp.c | 1 -
arch/arm/mach-mxs/mach-mxs.c | 1 -
arch/arm/mach-nomadik/cpu-8815.c | 1 -
arch/arm/mach-picoxcell/common.c | 1 -
arch/arm/mach-prima2/common.c | 3 ---
arch/arm/mach-shmobile/board-ape6evm.c | 1 -
arch/arm/mach-shmobile/board-kzm9g-reference.c | 1 -
arch/arm/mach-shmobile/board-lager.c | 1 -
arch/arm/mach-shmobile/setup-emev2.c | 1 -
arch/arm/mach-shmobile/setup-r8a73a4.c | 1 -
arch/arm/mach-shmobile/setup-r8a7790.c | 1 -
arch/arm/mach-shmobile/setup-sh73a0.c | 1 -
arch/arm/mach-spear/spear1310.c | 1 -
arch/arm/mach-spear/spear1340.c | 1 -
arch/arm/mach-spear/spear300.c | 1 -
arch/arm/mach-spear/spear310.c | 1 -
arch/arm/mach-spear/spear320.c | 1 -
arch/arm/mach-spear/spear6xx.c | 1 -
arch/arm/mach-sunxi/sunxi.c | 1 -
arch/arm/mach-vexpress/v2m.c | 1 -
arch/arm/mach-virt/virt.c | 1 -
arch/arm/mach-vt8500/vt8500.c | 1 -
arch/arm/mach-zynq/common.c | 1 -
26 files changed, 28 deletions(-)

--
1.8.1.2


2013-05-13 09:44:46

by Maxime Ripard

[permalink] [raw]
Subject: [PATCH 10/14] ARM: mxs: 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 mxs as well.

Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-mxs/mach-mxs.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 5b62b64..ef892b1 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -435,7 +435,6 @@ static const char *mxs_dt_compat[] __initdata = {

DT_MACHINE_START(MXS, "Freescale MXS (Device Tree)")
.map_io = debug_ll_io_init,
- .init_irq = irqchip_init,
.handle_irq = icoll_handle_irq,
.init_time = mxs_timer_init,
.init_machine = mxs_machine_init,
--
1.8.1.2

2013-05-13 09:44:48

by Maxime Ripard

[permalink] [raw]
Subject: [PATCH 12/14] ARM: vexpress: 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 vexpress as well.

Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-vexpress/v2m.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 8802030..c419b76 100644
--- a/arch/arm/mach-vexpress/v2m.c
+++ b/arch/arm/mach-vexpress/v2m.c
@@ -458,7 +458,6 @@ DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express")
.smp = smp_ops(vexpress_smp_ops),
.map_io = v2m_dt_map_io,
.init_early = v2m_dt_init_early,
- .init_irq = irqchip_init,
.init_time = v2m_dt_timer_init,
.init_machine = v2m_dt_init,
MACHINE_END
--
1.8.1.2

2013-05-13 09:45:03

by Maxime Ripard

[permalink] [raw]
Subject: [PATCH 14/14] ARM: vt8500: 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 vt8500 as well.

Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-vt8500/vt8500.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-vt8500/vt8500.c b/arch/arm/mach-vt8500/vt8500.c
index 1dd281e..1585900 100644
--- a/arch/arm/mach-vt8500/vt8500.c
+++ b/arch/arm/mach-vt8500/vt8500.c
@@ -178,7 +178,6 @@ static const char * const vt8500_dt_compat[] = {
DT_MACHINE_START(WMT_DT, "VIA/Wondermedia SoC (Device Tree Support)")
.dt_compat = vt8500_dt_compat,
.map_io = vt8500_map_io,
- .init_irq = irqchip_init,
.init_machine = vt8500_init,
.init_time = clocksource_of_init,
.restart = vt8500_restart,
--
1.8.1.2

2013-05-13 09:45:53

by Maxime Ripard

[permalink] [raw]
Subject: [PATCH 13/14] ARM: virt: 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 virt as well.

Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-virt/virt.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-virt/virt.c b/arch/arm/mach-virt/virt.c
index 061f283..2370a61 100644
--- a/arch/arm/mach-virt/virt.c
+++ b/arch/arm/mach-virt/virt.c
@@ -39,7 +39,6 @@ static const char *virt_dt_match[] = {
extern struct smp_operations virt_smp_ops;

DT_MACHINE_START(VIRT, "Dummy Virtual Machine")
- .init_irq = irqchip_init,
.init_machine = virt_init,
.smp = smp_ops(virt_smp_ops),
.dt_compat = virt_dt_match,
--
1.8.1.2

2013-05-13 09:46:11

by Viresh Kumar

[permalink] [raw]
Subject: Re: [PATCH 07/14] ARM: spear: Remove init_irq declaration in machine description

On 13 May 2013 15:14, Maxime Ripard <[email protected]> wrote:
> 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: Maxime Ripard <[email protected]>
> ---
> arch/arm/mach-spear/spear1310.c | 1 -
> arch/arm/mach-spear/spear1340.c | 1 -
> arch/arm/mach-spear/spear300.c | 1 -
> arch/arm/mach-spear/spear310.c | 1 -
> arch/arm/mach-spear/spear320.c | 1 -
> arch/arm/mach-spear/spear6xx.c | 1 -
> 6 files changed, 6 deletions(-)

Acked-by: Viresh Kumar <[email protected]>

2013-05-13 09:44:41

by Maxime Ripard

[permalink] [raw]
Subject: [PATCH 07/14] 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: Maxime Ripard <[email protected]>
---
arch/arm/mach-spear/spear1310.c | 1 -
arch/arm/mach-spear/spear1340.c | 1 -
arch/arm/mach-spear/spear300.c | 1 -
arch/arm/mach-spear/spear310.c | 1 -
arch/arm/mach-spear/spear320.c | 1 -
arch/arm/mach-spear/spear6xx.c | 1 -
6 files changed, 6 deletions(-)

diff --git a/arch/arm/mach-spear/spear1310.c b/arch/arm/mach-spear/spear1310.c
index 9eaac2c..b2da424 100644
--- a/arch/arm/mach-spear/spear1310.c
+++ b/arch/arm/mach-spear/spear1310.c
@@ -60,7 +60,6 @@ static void __init spear1310_map_io(void)
DT_MACHINE_START(SPEAR1310_DT, "ST SPEAr1310 SoC with Flattened Device Tree")
.smp = smp_ops(spear13xx_smp_ops),
.map_io = spear1310_map_io,
- .init_irq = irqchip_init,
.init_time = spear13xx_timer_init,
.init_machine = spear1310_dt_init,
.restart = spear_restart,
diff --git a/arch/arm/mach-spear/spear1340.c b/arch/arm/mach-spear/spear1340.c
index a04a7fe..dae1167 100644
--- a/arch/arm/mach-spear/spear1340.c
+++ b/arch/arm/mach-spear/spear1340.c
@@ -155,7 +155,6 @@ static const char * const spear1340_dt_board_compat[] = {
DT_MACHINE_START(SPEAR1340_DT, "ST SPEAr1340 SoC with Flattened Device Tree")
.smp = smp_ops(spear13xx_smp_ops),
.map_io = spear13xx_map_io,
- .init_irq = irqchip_init,
.init_time = spear13xx_timer_init,
.init_machine = spear1340_dt_init,
.restart = spear_restart,
diff --git a/arch/arm/mach-spear/spear300.c b/arch/arm/mach-spear/spear300.c
index bac56e8..185b9ba 100644
--- a/arch/arm/mach-spear/spear300.c
+++ b/arch/arm/mach-spear/spear300.c
@@ -212,7 +212,6 @@ static void __init spear300_map_io(void)

DT_MACHINE_START(SPEAR300_DT, "ST SPEAr300 SoC with Flattened Device Tree")
.map_io = spear300_map_io,
- .init_irq = irqchip_init,
.init_time = spear3xx_timer_init,
.init_machine = spear300_dt_init,
.restart = spear_restart,
diff --git a/arch/arm/mach-spear/spear310.c b/arch/arm/mach-spear/spear310.c
index 6ffbc63..ebc07e6 100644
--- a/arch/arm/mach-spear/spear310.c
+++ b/arch/arm/mach-spear/spear310.c
@@ -254,7 +254,6 @@ static void __init spear310_map_io(void)

DT_MACHINE_START(SPEAR310_DT, "ST SPEAr310 SoC with Flattened Device Tree")
.map_io = spear310_map_io,
- .init_irq = irqchip_init,
.init_time = spear3xx_timer_init,
.init_machine = spear310_dt_init,
.restart = spear_restart,
diff --git a/arch/arm/mach-spear/spear320.c b/arch/arm/mach-spear/spear320.c
index 6eb3eec..1fa4929 100644
--- a/arch/arm/mach-spear/spear320.c
+++ b/arch/arm/mach-spear/spear320.c
@@ -269,7 +269,6 @@ static void __init spear320_map_io(void)

DT_MACHINE_START(SPEAR320_DT, "ST SPEAr320 SoC with Flattened Device Tree")
.map_io = spear320_map_io,
- .init_irq = irqchip_init,
.init_time = spear3xx_timer_init,
.init_machine = spear320_dt_init,
.restart = spear_restart,
diff --git a/arch/arm/mach-spear/spear6xx.c b/arch/arm/mach-spear/spear6xx.c
index ec8eefb..0359f2e 100644
--- a/arch/arm/mach-spear/spear6xx.c
+++ b/arch/arm/mach-spear/spear6xx.c
@@ -423,7 +423,6 @@ static const char *spear600_dt_board_compat[] = {

DT_MACHINE_START(SPEAR600_DT, "ST SPEAr600 (Flattened Device Tree)")
.map_io = spear6xx_map_io,
- .init_irq = irqchip_init,
.init_time = spear6xx_timer_init,
.init_machine = spear600_dt_init,
.restart = spear_restart,
--
1.8.1.2

2013-05-13 09:46:32

by Maxime Ripard

[permalink] [raw]
Subject: [PATCH 11/14] ARM: sirf: 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 sirf as well.

Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-prima2/common.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c
index 4f94cd8..52e28cf 100644
--- a/arch/arm/mach-prima2/common.c
+++ b/arch/arm/mach-prima2/common.c
@@ -55,7 +55,6 @@ DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)")
/* Maintainer: Barry Song <[email protected]> */
.nr_irqs = 128,
.map_io = sirfsoc_map_io,
- .init_irq = irqchip_init,
.init_time = sirfsoc_init_time,
.init_machine = sirfsoc_mach_init,
.init_late = sirfsoc_init_late,
@@ -74,7 +73,6 @@ DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")
/* Maintainer: Barry Song <[email protected]> */
.nr_irqs = 128,
.map_io = sirfsoc_map_io,
- .init_irq = irqchip_init,
.init_time = sirfsoc_init_time,
.dma_zone_size = SZ_256M,
.init_machine = sirfsoc_mach_init,
@@ -94,7 +92,6 @@ DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)")
/* Maintainer: Barry Song <[email protected]> */
.smp = smp_ops(sirfsoc_smp_ops),
.map_io = sirfsoc_map_io,
- .init_irq = irqchip_init,
.init_time = sirfsoc_init_time,
.init_machine = sirfsoc_mach_init,
.init_late = sirfsoc_init_late,
--
1.8.1.2

2013-05-13 09:44:38

by Maxime Ripard

[permalink] [raw]
Subject: [PATCH 05/14] ARM: shmobile: 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 shmobile as well.

Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-shmobile/board-ape6evm.c | 1 -
arch/arm/mach-shmobile/board-kzm9g-reference.c | 1 -
arch/arm/mach-shmobile/board-lager.c | 1 -
arch/arm/mach-shmobile/setup-emev2.c | 1 -
arch/arm/mach-shmobile/setup-r8a73a4.c | 1 -
arch/arm/mach-shmobile/setup-r8a7790.c | 1 -
arch/arm/mach-shmobile/setup-sh73a0.c | 1 -
7 files changed, 7 deletions(-)

diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index 55b8c9f..913ce31 100644
--- a/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/arch/arm/mach-shmobile/board-ape6evm.c
@@ -87,7 +87,6 @@ static const char *ape6evm_boards_compat_dt[] __initdata = {
};

DT_MACHINE_START(APE6EVM_DT, "ape6evm")
- .init_irq = irqchip_init,
.init_time = shmobile_timer_init,
.init_machine = ape6evm_add_standard_devices,
.dt_compat = ape6evm_boards_compat_dt,
diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
index aefa50d..eaec498 100644
--- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
@@ -100,7 +100,6 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-reference")
.map_io = sh73a0_map_io,
.init_early = sh73a0_init_delay,
.nr_irqs = NR_IRQS_LEGACY,
- .init_irq = irqchip_init,
.init_machine = kzm_init,
.init_time = shmobile_timer_init,
.dt_compat = kzm9g_boards_compat_dt,
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index f587187..c384c9f 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -39,7 +39,6 @@ static const char *lager_boards_compat_dt[] __initdata = {
};

DT_MACHINE_START(LAGER_DT, "lager")
- .init_irq = irqchip_init,
.init_time = r8a7790_timer_init,
.init_machine = lager_add_standard_devices,
.dt_compat = lager_boards_compat_dt,
diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c
index 899a86c..098ca63 100644
--- a/arch/arm/mach-shmobile/setup-emev2.c
+++ b/arch/arm/mach-shmobile/setup-emev2.c
@@ -454,7 +454,6 @@ DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
.smp = smp_ops(emev2_smp_ops),
.init_early = emev2_init_delay,
.nr_irqs = NR_IRQS_LEGACY,
- .init_irq = irqchip_init,
.init_machine = emev2_add_standard_devices_dt,
.dt_compat = emev2_boards_compat_dt,
MACHINE_END
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index c5a75a7..6b19d50 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -194,7 +194,6 @@ static const char *r8a73a4_boards_compat_dt[] __initdata = {
};

DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
- .init_irq = irqchip_init,
.init_machine = r8a73a4_add_standard_devices_dt,
.init_time = shmobile_timer_init,
.dt_compat = r8a73a4_boards_compat_dt,
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 49de2d5..d639aad 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -142,7 +142,6 @@ static const char *r8a7790_boards_compat_dt[] __initdata = {
};

DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
- .init_irq = irqchip_init,
.init_machine = r8a7790_add_standard_devices_dt,
.init_time = r8a7790_timer_init,
.dt_compat = r8a7790_boards_compat_dt,
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index fdf3894..3a7d24a 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -1035,7 +1035,6 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
.map_io = sh73a0_map_io,
.init_early = sh73a0_init_delay,
.nr_irqs = NR_IRQS_LEGACY,
- .init_irq = irqchip_init,
.init_machine = sh73a0_add_standard_devices_dt,
.dt_compat = sh73a0_boards_compat_dt,
MACHINE_END
--
1.8.1.2

2013-05-13 09:47:11

by Maxime Ripard

[permalink] [raw]
Subject: [PATCH 08/14] ARM: msm: 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 msm as well.

Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-msm/board-dt-8660.c | 1 -
arch/arm/mach-msm/board-dt-8960.c | 1 -
2 files changed, 2 deletions(-)

diff --git a/arch/arm/mach-msm/board-dt-8660.c b/arch/arm/mach-msm/board-dt-8660.c
index 7dcfc53..1360226 100644
--- a/arch/arm/mach-msm/board-dt-8660.c
+++ b/arch/arm/mach-msm/board-dt-8660.c
@@ -44,7 +44,6 @@ static const char *msm8x60_fluid_match[] __initdata = {
DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
.smp = smp_ops(msm_smp_ops),
.map_io = msm_map_msm8x60_io,
- .init_irq = irqchip_init,
.init_machine = msm8x60_dt_init,
.init_late = msm8x60_init_late,
.init_time = msm_dt_timer_init,
diff --git a/arch/arm/mach-msm/board-dt-8960.c b/arch/arm/mach-msm/board-dt-8960.c
index 7301936..1e8eb1d 100644
--- a/arch/arm/mach-msm/board-dt-8960.c
+++ b/arch/arm/mach-msm/board-dt-8960.c
@@ -31,7 +31,6 @@ static const char * const msm8960_dt_match[] __initconst = {
DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)")
.smp = smp_ops(msm_smp_ops),
.map_io = msm_map_msm8960_io,
- .init_irq = irqchip_init,
.init_time = msm_dt_timer_init,
.init_machine = msm_dt_init,
.dt_compat = msm8960_dt_match,
--
1.8.1.2

2013-05-13 09:47:09

by Maxime Ripard

[permalink] [raw]
Subject: [PATCH 09/14] ARM: mvebu: 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 mvebu as well.

Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-mvebu/armada-370-xp.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 42a4cb3..8500002 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -96,7 +96,6 @@ DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)")
.init_machine = armada_370_xp_dt_init,
.map_io = armada_370_xp_map_io,
.init_early = armada_370_xp_init_early,
- .init_irq = irqchip_init,
.init_time = armada_370_xp_timer_and_clk_init,
.restart = mvebu_restart,
.dt_compat = armada_370_xp_dt_compat,
--
1.8.1.2

2013-05-13 09:44:35

by Maxime Ripard

[permalink] [raw]
Subject: [PATCH 01/14] ARM: sunxi: 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 sunxi as well.

Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-sunxi/sunxi.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index 706ce35..4de1edf 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -117,7 +117,6 @@ static const char * const sunxi_board_dt_compat[] = {
DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
.init_machine = sunxi_dt_init,
.map_io = sunxi_map_io,
- .init_irq = irqchip_init,
.init_time = sunxi_timer_init,
.dt_compat = sunxi_board_dt_compat,
MACHINE_END
--
1.8.1.2

2013-05-13 09:47:54

by Maxime Ripard

[permalink] [raw]
Subject: [PATCH 04/14] ARM: picoxcell: 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 picoxcell as well.

Signed-off-by: Maxime Ripard <[email protected]>
Acked-by: Jamie Iles <[email protected]>
---
arch/arm/mach-picoxcell/common.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c
index 70b441a..b444947 100644
--- a/arch/arm/mach-picoxcell/common.c
+++ b/arch/arm/mach-picoxcell/common.c
@@ -87,7 +87,6 @@ static void picoxcell_wdt_restart(char mode, const char *cmd)
DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")
.map_io = picoxcell_map_io,
.nr_irqs = NR_IRQS_LEGACY,
- .init_irq = irqchip_init,
.init_time = dw_apb_timer_init,
.init_machine = picoxcell_init_machine,
.dt_compat = picoxcell_dt_match,
--
1.8.1.2

2013-05-13 09:47:52

by Maxime Ripard

[permalink] [raw]
Subject: [PATCH 06/14] ARM: bcm281xx: 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 bcm281xx as well.

Signed-off-by: Maxime Ripard <[email protected]>
---
arch/arm/mach-bcm/board_bcm.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-bcm/board_bcm.c b/arch/arm/mach-bcm/board_bcm.c
index 22e8421..24556cf 100644
--- a/arch/arm/mach-bcm/board_bcm.c
+++ b/arch/arm/mach-bcm/board_bcm.c
@@ -54,7 +54,6 @@ static void __init board_init(void)
static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, };

DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
- .init_irq = irqchip_init,
.init_time = clocksource_of_init,
.init_machine = board_init,
.dt_compat = bcm11351_dt_compat,
--
1.8.1.2

2013-05-13 09:48:34

by Maxime Ripard

[permalink] [raw]
Subject: [PATCH 03/14] ARM: nomadik: 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 nomadik as well.

Signed-off-by: Maxime Ripard <[email protected]>
Acked-by: Linus Walleij <[email protected]>
---
arch/arm/mach-nomadik/cpu-8815.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c
index 59f6ff5..3d43f95 100644
--- a/arch/arm/mach-nomadik/cpu-8815.c
+++ b/arch/arm/mach-nomadik/cpu-8815.c
@@ -323,7 +323,6 @@ static const char * cpu8815_board_compat[] = {

DT_MACHINE_START(NOMADIK_DT, "Nomadik STn8815")
.map_io = cpu8815_map_io,
- .init_irq = irqchip_init,
.init_time = cpu8815_timer_init_of,
.init_machine = cpu8815_init_of,
.restart = cpu8815_restart,
--
1.8.1.2

2013-05-13 09:48:55

by Maxime Ripard

[permalink] [raw]
Subject: [PATCH 02/14] ARM: zynq: 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 zynq as well.

Signed-off-by: Maxime Ripard <[email protected]>
Acked-by: Michal Simek <[email protected]>
---
arch/arm/mach-zynq/common.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c
index 5bfe703..8bc3acb 100644
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
@@ -106,7 +106,6 @@ static const char * const zynq_dt_match[] = {
MACHINE_START(XILINX_EP107, "Xilinx Zynq Platform")
.smp = smp_ops(zynq_smp_ops),
.map_io = zynq_map_io,
- .init_irq = irqchip_init,
.init_machine = zynq_init_machine,
.init_time = zynq_timer_init,
.dt_compat = zynq_dt_match,
--
1.8.1.2

2013-05-13 12:36:06

by Pawel Moll

[permalink] [raw]
Subject: Re: [PATCH 12/14] ARM: vexpress: Remove init_irq declaration in machine description

On Mon, 2013-05-13 at 10:44 +0100, Maxime Ripard wrote:
> 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 vexpress as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> arch/arm/mach-vexpress/v2m.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
> index 8802030..c419b76 100644
> --- a/arch/arm/mach-vexpress/v2m.c
> +++ b/arch/arm/mach-vexpress/v2m.c
> @@ -458,7 +458,6 @@ DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express")
> .smp = smp_ops(vexpress_smp_ops),
> .map_io = v2m_dt_map_io,
> .init_early = v2m_dt_init_early,
> - .init_irq = irqchip_init,
> .init_time = v2m_dt_timer_init,
> .init_machine = v2m_dt_init,
> MACHINE_END

Acked-by: Pawel Moll <[email protected]>

Thanks!

Pawel

2013-05-13 15:20:21

by Jason Cooper

[permalink] [raw]
Subject: Re: [PATCH 09/14] ARM: mvebu: Remove init_irq declaration in machine description

On Mon, May 13, 2013 at 11:44:08AM +0200, Maxime Ripard wrote:
> 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 mvebu as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> arch/arm/mach-mvebu/armada-370-xp.c | 1 -
> 1 file changed, 1 deletion(-)

Maxime,

Do do want the individual submaintainers to take these? Or, send one
branch to Arnd and Olof? I'm fine with either one as any merge
conflicts should be trivial.

In either case,

Acked-by: Jason Cooper <[email protected]>

thx,

Jason.

2013-05-13 15:53:43

by Maxime Ripard

[permalink] [raw]
Subject: Re: [PATCH 09/14] ARM: mvebu: Remove init_irq declaration in machine description

Hi Jason,

Le 13/05/2013 17:19, Jason Cooper a ?crit :
> On Mon, May 13, 2013 at 11:44:08AM +0200, Maxime Ripard wrote:
>> 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 mvebu as well.
>>
>> Signed-off-by: Maxime Ripard <[email protected]>
>> ---
>> arch/arm/mach-mvebu/armada-370-xp.c | 1 -
>> 1 file changed, 1 deletion(-)
>
> Maxime,
>
> Do do want the individual submaintainers to take these? Or, send one
> branch to Arnd and Olof? I'm fine with either one as any merge
> conflicts should be trivial.

I don't have a strong opinion on this one, I guess both will be fine.
Arnd, Olof, what do you prefer?

I'll probably have to send a v2 anyway, I forgot to remove the include
of the irqchip headers.

Maxime

--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

2013-05-13 17:09:05

by Olof Johansson

[permalink] [raw]
Subject: Re: [PATCH 09/14] ARM: mvebu: Remove init_irq declaration in machine description

On Mon, May 13, 2013 at 8:53 AM, Maxime Ripard
<[email protected]> wrote:
> Hi Jason,
>
> Le 13/05/2013 17:19, Jason Cooper a ?crit :
>> On Mon, May 13, 2013 at 11:44:08AM +0200, Maxime Ripard wrote:
>>> 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 mvebu as well.
>>>
>>> Signed-off-by: Maxime Ripard <[email protected]>
>>> ---
>>> arch/arm/mach-mvebu/armada-370-xp.c | 1 -
>>> 1 file changed, 1 deletion(-)
>>
>> Maxime,
>>
>> Do do want the individual submaintainers to take these? Or, send one
>> branch to Arnd and Olof? I'm fine with either one as any merge
>> conflicts should be trivial.
>
> I don't have a strong opinion on this one, I guess both will be fine.
> Arnd, Olof, what do you prefer?
>
> I'll probably have to send a v2 anyway, I forgot to remove the include
> of the irqchip headers.

Since each and every patch applies cleanly and things work well both
before and after, let's have each maintainer that is active apply
their own. If there are platforms that don't have a significant number
of patches, i.e. if they're not collecting a branch, then we can apply
those. Please follow up with us with the stragglers, I'll assume the
rest will come in through the respective maintainers.


-Olof

2013-05-13 18:26:53

by David Brown

[permalink] [raw]
Subject: Re: [PATCH 08/14] ARM: msm: Remove init_irq declaration in machine description

On Mon, May 13, 2013 at 11:44:07AM +0200, Maxime Ripard wrote:
> 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 msm as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> arch/arm/mach-msm/board-dt-8660.c | 1 -
> arch/arm/mach-msm/board-dt-8960.c | 1 -
> 2 files changed, 2 deletions(-)

I'll pull this into my msm-cleanup tree.

David

--
sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation

2013-05-13 20:08:21

by Christian Daudt

[permalink] [raw]
Subject: Re: [PATCH 06/14] ARM: bcm281xx: Remove init_irq declaration in machine description

On 13-05-13 02:44 AM, Maxime Ripard wrote:
> 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 bcm281xx as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> arch/arm/mach-bcm/board_bcm.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/arch/arm/mach-bcm/board_bcm.c b/arch/arm/mach-bcm/board_bcm.c
> index 22e8421..24556cf 100644
> --- a/arch/arm/mach-bcm/board_bcm.c
> +++ b/arch/arm/mach-bcm/board_bcm.c
> @@ -54,7 +54,6 @@ static void __init board_init(void)
> static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, };
>
> DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
> - .init_irq = irqchip_init,
> .init_time = clocksource_of_init,
> .init_machine = board_init,
> .dt_compat = bcm11351_dt_compat,
Acked-by: Christian Daudt <[email protected]>


thanks,
csd

2013-05-14 00:35:12

by Simon Horman

[permalink] [raw]
Subject: Re: [PATCH 05/14] ARM: shmobile: Remove init_irq declaration in machine description

On Mon, May 13, 2013 at 11:44:04AM +0200, Maxime Ripard wrote:
> 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 shmobile as well.

Hi Maxime,

If possible, I would prefer separate patches for each board and SoC.

>
> Signed-off-by: Maxime Ripard <[email protected]>
> ---
> arch/arm/mach-shmobile/board-ape6evm.c | 1 -
> arch/arm/mach-shmobile/board-kzm9g-reference.c | 1 -
> arch/arm/mach-shmobile/board-lager.c | 1 -
> arch/arm/mach-shmobile/setup-emev2.c | 1 -
> arch/arm/mach-shmobile/setup-r8a73a4.c | 1 -
> arch/arm/mach-shmobile/setup-r8a7790.c | 1 -
> arch/arm/mach-shmobile/setup-sh73a0.c | 1 -
> 7 files changed, 7 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
> index 55b8c9f..913ce31 100644
> --- a/arch/arm/mach-shmobile/board-ape6evm.c
> +++ b/arch/arm/mach-shmobile/board-ape6evm.c
> @@ -87,7 +87,6 @@ static const char *ape6evm_boards_compat_dt[] __initdata = {
> };
>
> DT_MACHINE_START(APE6EVM_DT, "ape6evm")
> - .init_irq = irqchip_init,
> .init_time = shmobile_timer_init,
> .init_machine = ape6evm_add_standard_devices,
> .dt_compat = ape6evm_boards_compat_dt,
> diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> index aefa50d..eaec498 100644
> --- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
> +++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
> @@ -100,7 +100,6 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-reference")
> .map_io = sh73a0_map_io,
> .init_early = sh73a0_init_delay,
> .nr_irqs = NR_IRQS_LEGACY,
> - .init_irq = irqchip_init,
> .init_machine = kzm_init,
> .init_time = shmobile_timer_init,
> .dt_compat = kzm9g_boards_compat_dt,
> diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
> index f587187..c384c9f 100644
> --- a/arch/arm/mach-shmobile/board-lager.c
> +++ b/arch/arm/mach-shmobile/board-lager.c
> @@ -39,7 +39,6 @@ static const char *lager_boards_compat_dt[] __initdata = {
> };
>
> DT_MACHINE_START(LAGER_DT, "lager")
> - .init_irq = irqchip_init,
> .init_time = r8a7790_timer_init,
> .init_machine = lager_add_standard_devices,
> .dt_compat = lager_boards_compat_dt,
> diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c
> index 899a86c..098ca63 100644
> --- a/arch/arm/mach-shmobile/setup-emev2.c
> +++ b/arch/arm/mach-shmobile/setup-emev2.c
> @@ -454,7 +454,6 @@ DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
> .smp = smp_ops(emev2_smp_ops),
> .init_early = emev2_init_delay,
> .nr_irqs = NR_IRQS_LEGACY,
> - .init_irq = irqchip_init,
> .init_machine = emev2_add_standard_devices_dt,
> .dt_compat = emev2_boards_compat_dt,
> MACHINE_END
> diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
> index c5a75a7..6b19d50 100644
> --- a/arch/arm/mach-shmobile/setup-r8a73a4.c
> +++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
> @@ -194,7 +194,6 @@ static const char *r8a73a4_boards_compat_dt[] __initdata = {
> };
>
> DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
> - .init_irq = irqchip_init,
> .init_machine = r8a73a4_add_standard_devices_dt,
> .init_time = shmobile_timer_init,
> .dt_compat = r8a73a4_boards_compat_dt,
> diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
> index 49de2d5..d639aad 100644
> --- a/arch/arm/mach-shmobile/setup-r8a7790.c
> +++ b/arch/arm/mach-shmobile/setup-r8a7790.c
> @@ -142,7 +142,6 @@ static const char *r8a7790_boards_compat_dt[] __initdata = {
> };
>
> DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
> - .init_irq = irqchip_init,
> .init_machine = r8a7790_add_standard_devices_dt,
> .init_time = r8a7790_timer_init,
> .dt_compat = r8a7790_boards_compat_dt,
> diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
> index fdf3894..3a7d24a 100644
> --- a/arch/arm/mach-shmobile/setup-sh73a0.c
> +++ b/arch/arm/mach-shmobile/setup-sh73a0.c
> @@ -1035,7 +1035,6 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
> .map_io = sh73a0_map_io,
> .init_early = sh73a0_init_delay,
> .nr_irqs = NR_IRQS_LEGACY,
> - .init_irq = irqchip_init,
> .init_machine = sh73a0_add_standard_devices_dt,
> .dt_compat = sh73a0_boards_compat_dt,
> MACHINE_END
> --
> 1.8.1.2
>

2013-05-14 08:23:31

by Maxime Ripard

[permalink] [raw]
Subject: Re: [PATCH 05/14] ARM: shmobile: Remove init_irq declaration in machine description

Hi Simon,

Le 14/05/2013 02:35, Simon Horman a ?crit :
> On Mon, May 13, 2013 at 11:44:04AM +0200, Maxime Ripard wrote:
>> 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 shmobile as well.
>
> Hi Maxime,
>
> If possible, I would prefer separate patches for each board and SoC.

Ok, I'll split this and send it in the v2.

Thanks,
Maxime

--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

2013-05-14 08:25:51

by Maxime Ripard

[permalink] [raw]
Subject: Re: [PATCH 06/14] ARM: bcm281xx: Remove init_irq declaration in machine description

Hi Christian,

Le 13/05/2013 22:06, Christian Daudt a ?crit :
> On 13-05-13 02:44 AM, Maxime Ripard wrote:
>> 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 bcm281xx as well.
>>
>> Signed-off-by: Maxime Ripard <[email protected]>
>> ---
>> arch/arm/mach-bcm/board_bcm.c | 1 -
>> 1 file changed, 1 deletion(-)
>>
>> diff --git a/arch/arm/mach-bcm/board_bcm.c
>> b/arch/arm/mach-bcm/board_bcm.c
>> index 22e8421..24556cf 100644
>> --- a/arch/arm/mach-bcm/board_bcm.c
>> +++ b/arch/arm/mach-bcm/board_bcm.c
>> @@ -54,7 +54,6 @@ static void __init board_init(void)
>> static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351",
>> NULL, };
>> DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
>> - .init_irq = irqchip_init,
>> .init_time = clocksource_of_init,
>> .init_machine = board_init,
>> .dt_compat = bcm11351_dt_compat,
> Acked-by: Christian Daudt <[email protected]>

Thanks!

I forgot to remove the include of irqchip.h into all these patches, so
I'll send a v2, and I guess you could probably merge it through your
tree after that directly.

Maxime

--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

2013-05-14 08:32:58

by Maxime Ripard

[permalink] [raw]
Subject: Re: [PATCH 08/14] ARM: msm: Remove init_irq declaration in machine description

Hi David,

Le 13/05/2013 20:26, David Brown a ?crit :
> On Mon, May 13, 2013 at 11:44:07AM +0200, Maxime Ripard wrote:
>> 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 msm as well.
>>
>> Signed-off-by: Maxime Ripard <[email protected]>
>> ---
>> arch/arm/mach-msm/board-dt-8660.c | 1 -
>> arch/arm/mach-msm/board-dt-8960.c | 1 -
>> 2 files changed, 2 deletions(-)
>
> I'll pull this into my msm-cleanup tree.

Like I said in other mails from this thread, I'll send a v2, so you
might want to hold off this patch until then.

Thanks!
Maxime

--
Maxime Ripard, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

2013-05-14 09:18:12

by Barry Song

[permalink] [raw]
Subject: Re: [PATCH 11/14] ARM: sirf: Remove init_irq declaration in machine description

2013/5/13 Maxime Ripard <[email protected]>:
> 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 sirf as well.
>
> Signed-off-by: Maxime Ripard <[email protected]>

Acked-by: Barry Song <[email protected]>

> ---
> arch/arm/mach-prima2/common.c | 3 ---
> 1 file changed, 3 deletions(-)
>
> diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c
> index 4f94cd8..52e28cf 100644
> --- a/arch/arm/mach-prima2/common.c
> +++ b/arch/arm/mach-prima2/common.c
> @@ -55,7 +55,6 @@ DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)")
> /* Maintainer: Barry Song <[email protected]> */
> .nr_irqs = 128,
> .map_io = sirfsoc_map_io,
> - .init_irq = irqchip_init,
> .init_time = sirfsoc_init_time,
> .init_machine = sirfsoc_mach_init,
> .init_late = sirfsoc_init_late,
> @@ -74,7 +73,6 @@ DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")
> /* Maintainer: Barry Song <[email protected]> */
> .nr_irqs = 128,
> .map_io = sirfsoc_map_io,
> - .init_irq = irqchip_init,
> .init_time = sirfsoc_init_time,
> .dma_zone_size = SZ_256M,
> .init_machine = sirfsoc_mach_init,
> @@ -94,7 +92,6 @@ DT_MACHINE_START(MARCO_DT, "Generic MARCO (Flattened Device Tree)")
> /* Maintainer: Barry Song <[email protected]> */
> .smp = smp_ops(sirfsoc_smp_ops),
> .map_io = sirfsoc_map_io,
> - .init_irq = irqchip_init,
> .init_time = sirfsoc_init_time,
> .init_machine = sirfsoc_mach_init,
> .init_late = sirfsoc_init_late,
> --
> 1.8.1.2

2013-05-14 14:59:28

by Christian Daudt

[permalink] [raw]
Subject: Re: [PATCH 06/14] ARM: bcm281xx: Remove init_irq declaration in machine description

On 13-05-14 01:25 AM, Maxime Ripard wrote:
> Hi Christian,
>
> Le 13/05/2013 22:06, Christian Daudt a ?crit :
>> On 13-05-13 02:44 AM, Maxime Ripard wrote:
>>> 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 bcm281xx as well.
>>>
>>> Signed-off-by: Maxime Ripard <[email protected]>
>>> ---
>>> arch/arm/mach-bcm/board_bcm.c | 1 -
>>> 1 file changed, 1 deletion(-)
>>>
>>> diff --git a/arch/arm/mach-bcm/board_bcm.c
>>> b/arch/arm/mach-bcm/board_bcm.c
>>> index 22e8421..24556cf 100644
>>> --- a/arch/arm/mach-bcm/board_bcm.c
>>> +++ b/arch/arm/mach-bcm/board_bcm.c
>>> @@ -54,7 +54,6 @@ static void __init board_init(void)
>>> static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351",
>>> NULL, };
>>> DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
>>> - .init_irq = irqchip_init,
>>> .init_time = clocksource_of_init,
>>> .init_machine = board_init,
>>> .dt_compat = bcm11351_dt_compat,
>> Acked-by: Christian Daudt <[email protected]>
> Thanks!
>
> I forgot to remove the include of irqchip.h into all these patches, so
> I'll send a v2, and I guess you could probably merge it through your
> tree after that directly.
Ok. will do.

thanks,
csd