Skip to contentSkip to conversation

ARM: shmobile: Use default ->init_irq()

PATCH New Magnus Damm 2 participants 10 messages Jul 1, 2013

Subsystems (4)
Arm (32-bit) Arm sub-architectures SuperH Arm/RISC-V/Renesas architecture
lore
Share & tools
lore

Magnus Damm

author maintainer
#0 lore raw

cover ARM: shmobile: Use default ->init_irq()

ARM: shmobile: Use default ->init_irq()

[PATCH 01/04] ARM: shmobile: Use default ->init_irq() on EMEV2 [PATCH 02/04] ARM: shmobile: Use default ->init_irq() on r8a73a4 [PATCH 03/04] ARM: shmobile: Use default ->init_irq() on r8a7790 [PATCH 04/04] ARM: shmobile: Use default ->init_irq() on sh73a0

Rework the mach-shmobile code to provide NULL as ->init_irq() callback instead of irqchip_init(). This cleans up the code and reduces the number of lines.

Signed-off-by Magnus Damm <[email protected]>

---

Written against renesas.git renesas-next-20130701 and [PATCH v2 00/07] ARM: shmobile: Remove unused auxdata and callbacks

 arch/arm/mach-shmobile/board-ape6evm.c         |    2 --
 arch/arm/mach-shmobile/board-kzm9g-reference.c |    2 --
 arch/arm/mach-shmobile/board-lager.c           |    2 --
 arch/arm/mach-shmobile/setup-emev2.c           |    2 --
 arch/arm/mach-shmobile/setup-r8a73a4.c         |    2 --
 arch/arm/mach-shmobile/setup-r8a7790.c         |    2 --
 arch/arm/mach-shmobile/setup-sh73a0.c          |    2 --
 7 files changed, 14 deletions(-)
author maintainer
#1 lore raw

PATCH 1/4 ARM: shmobile: Use default ->init_irq() on EMEV2

From: Magnus Damm <[email protected]>

Remove redundant irqchip_init() callback. The default case of NULL will result in invoking irqchip_init() anyway.

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/setup-emev2.c |    2 --
 1 file changed, 2 deletions(-)
arch/arm/mach-shmobile/setup-emev2.c +0 -2
@@ -20,7 +20,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/gpio-em.h>
 #include <linux/of_platform.h>

@@ -445,7 +444,6 @@ DT_MACHINE_START(EMEV2_DT, "Generic Emma
 	.smp		= smp_ops(emev2_smp_ops),
 	.init_early	= emev2_init_delay,
 	.nr_irqs	= NR_IRQS_LEGACY,
-	.init_irq	= irqchip_init,
 	.dt_compat	= emev2_boards_compat_dt,
 MACHINE_END
#2 lore raw

PATCH 1/4 ARM: shmobile: Use default ->init_irq() on EMEV2

Quoted 22 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Remove redundant irqchip_init() callback. The default case of NULL will result in invoking irqchip_init() anyway.

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/setup-emev2.c |    2 --
 1 file changed, 2 deletions(-)
arch/arm/mach-shmobile/setup-emev2.c +0 -1
@@ -20,7 +20,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/gpio-em.h>
 #include <linux/of_platform.h>

arch/arm/mach-shmobile/setup-emev2.c DT_MACHINE_START(EMEV2_DT, "Generic Emma · line 448

Quoted 6 lines
arch/arm/mach-shmobile/setup-emev2.c +0 -1
@@ -445,7 +444,6 @@ DT_MACHINE_START(EMEV2_DT, "Generic Emma
 	.smp		= smp_ops(emev2_smp_ops),
 	.init_early	= emev2_init_delay,
 	.nr_irqs	= NR_IRQS_LEGACY,
-	.init_irq	= irqchip_init,
 	.dt_compat	= emev2_boards_compat_dt,
 MACHINE_END

Hi Magnus,

I mistakenly dropped the following patch from Maxime Ripard from v3.11. I have re-queued it up, for v3.12, in the cleanup branch:

commit 4042de1229ecf083890d8ad5c9327e03b648c1a2

Author: Maxime Ripard <[email protected]>
Date:   Sun May 26 22:05:23 2013 +0900

ARM: shmobile: emev2: 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]>
Signed-off-by Simon Horman <[email protected]>
arch/arm/mach-shmobile/setup-emev2.c +0 -2
index 899a86c..66694e0 100644
@@ -20,7 +20,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/gpio-em.h>
 #include <linux/of_platform.h>

@@ -454,7 +453,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
author maintainer
#3 lore raw

PATCH 1/4 ARM: shmobile: Use default ->init_irq() on EMEV2

Hi Simon, Maxime, everyone,

Quoted 32 lines · Simon Horman
Quoted 22 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Remove redundant irqchip_init() callback. The default case of NULL will result in invoking irqchip_init() anyway.

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/setup-emev2.c |    2 --
 1 file changed, 2 deletions(-)
arch/arm/mach-shmobile/setup-emev2.c 2013-07-01 13:33:39.000000000 +0900 renamed from arch/arm/mach-shmobile/setup-emev2.c +0 -1
@@ -20,7 +20,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/gpio-em.h>
 #include <linux/of_platform.h>

arch/arm/mach-shmobile/setup-emev2.c 2013-07-01 13:33:39.000000000 +0900 DT_MACHINE_START(EMEV2_DT, "Generic Emma · line 448

Quoted 6 lines
arch/arm/mach-shmobile/setup-emev2.c 2013-07-01 13:33:39.000000000 +0900 renamed from arch/arm/mach-shmobile/setup-emev2.c +0 -1
@@ -445,7 +444,6 @@ DT_MACHINE_START(EMEV2_DT, "Generic Emma
      .smp            = smp_ops(emev2_smp_ops),
      .init_early     = emev2_init_delay,
      .nr_irqs        = NR_IRQS_LEGACY,
-     .init_irq       = irqchip_init,
      .dt_compat      = emev2_boards_compat_dt,
 MACHINE_END

Hi Magnus,

Quoted 8 lines

I mistakenly dropped the following patch from Maxime Ripard from v3.11. I have re-queued it up, for v3.12, in the cleanup branch:

commit 4042de1229ecf083890d8ad5c9327e03b648c1a2

Author: Maxime Ripard <[email protected]>
Date:   Sun May 26 22:05:23 2013 +0900

ARM: shmobile: emev2: Remove init_irq declaration in machine description

Thanks for going through earlier submitted patches and picking them up. Of course I welcome the contribution by Maxime so please use his code over mine wherever possible.

Cheers,

/ magnus

author maintainer
#4 lore raw

PATCH 2/4 ARM: shmobile: Use default ->init_irq() on r8a73a4

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Remove redundant irqchip_init() callback. The default case of NULL will result in invoking irqchip_init() anyway.

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/board-ape6evm.c |    2 --
 arch/arm/mach-shmobile/setup-r8a73a4.c |    2 --
 2 files changed, 4 deletions(-)
arch/arm/mach-shmobile/board-ape6evm.c +0 -2
@@ -20,7 +20,6 @@
 
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
-#include <linux/irqchip.h>
 #include <linux/kernel.h>
 #include <linux/pinctrl/machine.h>
 #include <linux/platform_device.h>

@@ -103,7 +102,6 @@ static const char *ape6evm_boards_compat
 
 DT_MACHINE_START(APE6EVM_DT, "ape6evm")
 	.init_early	= r8a73a4_init_delay,
-	.init_irq	= irqchip_init,
 	.init_time	= shmobile_timer_init,
 	.init_machine	= ape6evm_add_standard_devices,
 	.dt_compat	= ape6evm_boards_compat_dt,
arch/arm/mach-shmobile/setup-r8a73a4.c +0 -2
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/kernel.h>
 #include <linux/of_platform.h>
 #include <linux/platform_data/irq-renesas-irqc.h>

@@ -224,7 +223,6 @@ static const char *r8a73a4_boards_compat
 
 DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
 	.init_early	= r8a73a4_init_delay,
-	.init_irq	= irqchip_init,
 	.init_machine	= r8a73a4_add_standard_devices_dt,
 	.init_time	= shmobile_timer_init,
 	.dt_compat	= r8a73a4_boards_compat_dt,
#5 lore raw

PATCH 2/4 ARM: shmobile: Use default ->init_irq() on r8a73a4

Quoted 41 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Remove redundant irqchip_init() callback. The default case of NULL will result in invoking irqchip_init() anyway.

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/board-ape6evm.c |    2 --
 arch/arm/mach-shmobile/setup-r8a73a4.c |    2 --
 2 files changed, 4 deletions(-)
arch/arm/mach-shmobile/board-ape6evm.c +0 -2
@@ -20,7 +20,6 @@
 
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
-#include <linux/irqchip.h>
 #include <linux/kernel.h>
 #include <linux/pinctrl/machine.h>
 #include <linux/platform_device.h>

@@ -103,7 +102,6 @@ static const char *ape6evm_boards_compat
 
 DT_MACHINE_START(APE6EVM_DT, "ape6evm")
 	.init_early	= r8a73a4_init_delay,
-	.init_irq	= irqchip_init,
 	.init_time	= shmobile_timer_init,
 	.init_machine	= ape6evm_add_standard_devices,
 	.dt_compat	= ape6evm_boards_compat_dt,
arch/arm/mach-shmobile/setup-r8a73a4.c +0 -1
@@ -18,7 +18,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/kernel.h>
 #include <linux/of_platform.h>
 #include <linux/platform_data/irq-renesas-irqc.h>

arch/arm/mach-shmobile/setup-r8a73a4.c static const char *r8a73a4_boards_compat · line 228

Quoted 7 lines
arch/arm/mach-shmobile/setup-r8a73a4.c +0 -1
@@ -224,7 +223,6 @@ static const char *r8a73a4_boards_compat
 
 DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
 	.init_early	= r8a73a4_init_delay,
-	.init_irq	= irqchip_init,
 	.init_machine	= r8a73a4_add_standard_devices_dt,
 	.init_time	= shmobile_timer_init,
 	.dt_compat	= r8a73a4_boards_compat_dt,

Hi Magnus,

as per my remark about the emev2, I accidently dropped a patch from Maxime Ripard which corresponds to the setup-r8a73a4.c portion of your above patch. Accordingly I have re-queued up Maxime's patch for v3.12 and applied the board-ape6evm.c portion of your patch as follows. I have altered the title, partially so it uses the same scheme used by Maxime's patches and partially to reflect that it
now only covers the ape6evm board.

The result will be in the cleanup branch the next time that I push my tree, most likely later this afternoon.

commit eec81df7727a23e0da6a46b63aec1210fba884cf

Author: Magnus Damm <[email protected]>
Date:   Mon Jul 1 15:01:21 2013 +0900

ARM: shmobile: ape6evm: Remove init_irq declaration in machine description

Remove redundant irqchip_init() callback. The default case of NULL will result in invoking irqchip_init() anyway.

Signed-off-by Magnus Damm <[email protected]>

[ horms+renesas at verge.net.au: Trimmed patch to remove portion
that updates the r8a73a4 SoC and altered the subject to use the same format as the patch that updates the r8a73a4. ]

Signed-off-by Simon Horman <[email protected]>
arch/arm/mach-shmobile/board-ape6evm.c +0 -2
index 5eb0caa..1fbc39a 100644
@@ -20,7 +20,6 @@
 
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
-#include <linux/irqchip.h>
 #include <linux/kernel.h>
 #include <linux/pinctrl/machine.h>
 #include <linux/platform_device.h>

@@ -102,7 +101,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,
author maintainer
#6 lore raw

PATCH 3/4 ARM: shmobile: Use default ->init_irq() on r8a7790

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Remove redundant irqchip_init() callback. The default case of NULL will result in invoking irqchip_init() anyway.

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/board-lager.c   |    2 --
 arch/arm/mach-shmobile/setup-r8a7790.c |    2 --
 2 files changed, 4 deletions(-)
arch/arm/mach-shmobile/board-lager.c +0 -2
@@ -22,7 +22,6 @@
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
-#include <linux/irqchip.h>
 #include <linux/kernel.h>
 #include <linux/leds.h>
 #include <linux/pinctrl/machine.h>

@@ -104,7 +103,6 @@ static const char *lager_boards_compat_d
 
 DT_MACHINE_START(LAGER_DT, "lager")
 	.init_early	= r8a7790_init_delay,
-	.init_irq	= irqchip_init,
 	.init_time	= r8a7790_timer_init,
 	.init_machine	= lager_add_standard_devices,
 	.dt_compat	= lager_boards_compat_dt,
arch/arm/mach-shmobile/setup-r8a7790.c +0 -2
@@ -19,7 +19,6 @@
  */
 
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/kernel.h>
 #include <linux/of_platform.h>
 #include <linux/platform_data/gpio-rcar.h>

@@ -225,7 +224,6 @@ static const char *r8a7790_boards_compat
 
 DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
 	.init_early	= r8a7790_init_delay,
-	.init_irq	= irqchip_init,
 	.init_time	= r8a7790_timer_init,
 	.dt_compat	= r8a7790_boards_compat_dt,
 MACHINE_END
#7 lore raw

PATCH 3/4 ARM: shmobile: Use default ->init_irq() on r8a7790

Quoted 41 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Remove redundant irqchip_init() callback. The default case of NULL will result in invoking irqchip_init() anyway.

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/board-lager.c   |    2 --
 arch/arm/mach-shmobile/setup-r8a7790.c |    2 --
 2 files changed, 4 deletions(-)
arch/arm/mach-shmobile/board-lager.c +0 -2
@@ -22,7 +22,6 @@
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
-#include <linux/irqchip.h>
 #include <linux/kernel.h>
 #include <linux/leds.h>
 #include <linux/pinctrl/machine.h>

@@ -104,7 +103,6 @@ static const char *lager_boards_compat_d
 
 DT_MACHINE_START(LAGER_DT, "lager")
 	.init_early	= r8a7790_init_delay,
-	.init_irq	= irqchip_init,
 	.init_time	= r8a7790_timer_init,
 	.init_machine	= lager_add_standard_devices,
 	.dt_compat	= lager_boards_compat_dt,
arch/arm/mach-shmobile/setup-r8a7790.c +0 -1
@@ -19,7 +19,6 @@
  */
 
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/kernel.h>
 #include <linux/of_platform.h>
 #include <linux/platform_data/gpio-rcar.h>

arch/arm/mach-shmobile/setup-r8a7790.c static const char *r8a7790_boards_compat · line 229

Quoted 7 lines
arch/arm/mach-shmobile/setup-r8a7790.c +0 -1
@@ -225,7 +224,6 @@ static const char *r8a7790_boards_compat
 
 DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
 	.init_early	= r8a7790_init_delay,
-	.init_irq	= irqchip_init,
 	.init_time	= r8a7790_timer_init,
 	.dt_compat	= r8a7790_boards_compat_dt,
 MACHINE_END

Hi Magnus,

as per my remark about the emev2, I accidently dropped a patch from Maxime Ripard which corresponds to the setup-r8a7790.c portion of your above patch. Accordingly I have re-queued up Maxime's patch for v3.12 and applied the board-lager.c portion of your patch as follows. I have altered the title, partially so it uses the same scheme used by Maxime's patches and partially to reflect that it
now only covers the lager board.

The result will be in the cleanup branch the next time that I push my tree, most likely later this afternoon.

commit 4a94ed71a7b3e17c46a23b89039cfa113fbfaa43

Author: Magnus Damm <[email protected]>
Date:   Mon Jul 1 15:01:31 2013 +0900

ARM: shmobile: lager: Remove init_irq declaration in machine description

Remove redundant irqchip_init() callback. The default case of NULL will result in invoking irqchip_init() anyway.

Signed-off-by Magnus Damm <[email protected]>

[ horms+renesas at verge.net.au: Trimmed patch to remove portion
that updates the r8a7790 SoC and altered the subject to use the same format as the patch that updates the r8a7790. ]

Signed-off-by Simon Horman <[email protected]>
arch/arm/mach-shmobile/board-lager.c +0 -2
index d73e21d..1e99b17 100644
@@ -22,7 +22,6 @@
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
-#include <linux/irqchip.h>
 #include <linux/kernel.h>
 #include <linux/leds.h>
 #include <linux/pinctrl/machine.h>

@@ -103,7 +102,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,
author maintainer
#8 lore raw

PATCH 4/4 ARM: shmobile: Use default ->init_irq() on sh73a0

In reply to Magnus Damm

From: Magnus Damm <[email protected]>

Remove redundant irqchip_init() callback. The default case of NULL will result in invoking irqchip_init() anyway.

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/board-kzm9g-reference.c |    2 --
 arch/arm/mach-shmobile/setup-sh73a0.c          |    2 --
 2 files changed, 4 deletions(-)
arch/arm/mach-shmobile/board-kzm9g-reference.c +0 -2
@@ -24,7 +24,6 @@
 #include <linux/gpio.h>
 #include <linux/io.h>
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/input.h>
 #include <linux/of_platform.h>
 #include <linux/pinctrl/machine.h>

@@ -99,7 +98,6 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-refere
 	.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,
arch/arm/mach-shmobile/setup-sh73a0.c +0 -2
@@ -22,7 +22,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/platform_device.h>
 #include <linux/of_platform.h>
 #include <linux/delay.h>

@@ -983,7 +982,6 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH7
 	.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
#9 lore raw

PATCH 4/4 ARM: shmobile: Use default ->init_irq() on sh73a0

Quoted 41 lines · Magnus Damm

From: Magnus Damm <[email protected]>

Remove redundant irqchip_init() callback. The default case of NULL will result in invoking irqchip_init() anyway.

Signed-off-by Magnus Damm <[email protected]>

---

 arch/arm/mach-shmobile/board-kzm9g-reference.c |    2 --
 arch/arm/mach-shmobile/setup-sh73a0.c          |    2 --
 2 files changed, 4 deletions(-)
arch/arm/mach-shmobile/board-kzm9g-reference.c +0 -2
@@ -24,7 +24,6 @@
 #include <linux/gpio.h>
 #include <linux/io.h>
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/input.h>
 #include <linux/of_platform.h>
 #include <linux/pinctrl/machine.h>

@@ -99,7 +98,6 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-refere
 	.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,
arch/arm/mach-shmobile/setup-sh73a0.c +0 -1
@@ -22,7 +22,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/platform_device.h>
 #include <linux/of_platform.h>
 #include <linux/delay.h>

arch/arm/mach-shmobile/setup-sh73a0.c DT_MACHINE_START(SH73A0_DT, "Generic SH7 · line 987

Quoted 7 lines
arch/arm/mach-shmobile/setup-sh73a0.c +0 -1
@@ -983,7 +982,6 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH7
 	.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

Hi Magnus,

as per my remark about the emev2, I accidently dropped a patch from Maxime Ripard which corresponds to the setup-sh73a0.c portion of your above patch. Accordingly I have re-queued up Maxime's patch for v3.12 and applied the board-kzm9g-reference.c portion of your patch as follows. I have altered the title, partially so it uses the same scheme used by Maxime's patches and partially to reflect that it
now only covers the kzm9g board.

The result will be in the cleanup branch the next time that I push my tree, most likely later this afternoon.

commit 083c11c998f17c3ef4f2fc066424d6762254344b

Author: Magnus Damm <[email protected]>
Date:   Mon Jul 1 15:01:40 2013 +0900

ARM: shmobile: kzm9g: Remove init_irq declaration in machine description

Remove redundant irqchip_init() callback. The default case of NULL will result in invoking irqchip_init() anyway.

Signed-off-by Magnus Damm <[email protected]>

[ horms+renesas at verge.net.au: Trimmed patch to remove portion
that updates the sh73a0 SoC and altered the subject to use the same format as the patch that updates the sh73a0. ]

Signed-off-by Simon Horman <[email protected]>
arch/arm/mach-shmobile/board-kzm9g-reference.c +0 -2
index 44055fe..41092bb 100644
@@ -24,7 +24,6 @@
 #include <linux/gpio.h>
 #include <linux/io.h>
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/input.h>
 #include <linux/of_platform.h>
 #include <linux/pinctrl/machine.h>

@@ -99,7 +98,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,