diff mbox

[04/20] ARM: picoxcell: Remove init_irq declaration in machine description

Message ID 20130514162046.GA16346@page (mailing list archive)
State New, archived
Headers show

Commit Message

Jamie Iles May 14, 2013, 4:20 p.m. UTC 
Hi Maxime,

Thanks for this, I'll add it to my tree.  I've modified it slightly to 
kill off the other irq includes, hopefully that's okay with you.

Thanks,

Jamie

8<---

From 4b83f75a7af388aaf5f79ccf72c37074bc9166da Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Tue, 14 May 2013 17:38:37 +0200
Subject: [PATCH] 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.

[ jiles: removed other, unused irq includes. ]

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Jamie Iles <jamie@jamieiles.com>
---
 arch/arm/mach-picoxcell/common.c | 5 -----
 1 file changed, 5 deletions(-)

Comments

Maxime Ripard May 16, 2013, 8:19 a.m. UTC | #1 
Hi Jamie,

Le 14/05/2013 18:20, Jamie Iles a écrit :
> Hi Maxime,
> 
> Thanks for this, I'll add it to my tree.  I've modified it slightly to 
> kill off the other irq includes, hopefully that's okay with you.

Yes, I was pretty conservative since I was not familiar with most of the
code, but yes, I'm fine with the changes.

Thank you,
Maxime
Jamie Iles May 20, 2013, 10:42 p.m. UTC | #2 
On Thu, May 16, 2013 at 10:19:56AM +0200, Maxime Ripard wrote:
> Hi Jamie,
> 
> Le 14/05/2013 18:20, Jamie Iles a écrit :
> > Hi Maxime,
> > 
> > Thanks for this, I'll add it to my tree.  I've modified it slightly to 
> > kill off the other irq includes, hopefully that's okay with you.
> 
> Yes, I was pretty conservative since I was not familiar with most of the
> code, but yes, I'm fine with the changes.

Thanks Maxime, applied to picoxcell-next.

Jamie
diff mbox

Patch

diff --git a/arch/arm/mach-picoxcell/common.c b/arch/arm/mach-picoxcell/common.c
index f6f71bb..b069fa6 100644
--- a/arch/arm/mach-picoxcell/common.c
+++ b/arch/arm/mach-picoxcell/common.c
@@ -8,12 +8,8 @@ 
  * All enquiries to support@picochip.com
  */
 #include <linux/delay.h>
-#include <linux/irq.h>
-#include <linux/irqchip.h>
-#include <linux/irqdomain.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
-#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/dw_apb_timer.h>
 
@@ -85,7 +81,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,