diff mbox

[13/35] arm: omap: irq: call set_handle_irq() from intc_of_init

Message ID 1406582183-696-14-git-send-email-balbi@ti.com
State Accepted
Commit b15c76b74896f1a2c60fff13fdf20d07468de323
Headers show

Commit Message

Felipe Balbi July 28, 2014, 9:16 p.m. UTC
this will let us drop .handle_irq and .init_irq fields
from our generic machine_descs.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 arch/arm/mach-omap2/irq.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Sebastian Reichel July 29, 2014, 2:20 a.m. UTC | #1
Hi,

On Mon, Jul 28, 2014 at 04:16:01PM -0500, Felipe Balbi wrote:
> this will let us drop .handle_irq and .init_irq fields
> from our generic machine_descs.
> 
> Signed-off-by: Felipe Balbi <balbi@ti.com>
> ---
>  arch/arm/mach-omap2/irq.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
> index e6997c5..e452411 100644
> --- a/arch/arm/mach-omap2/irq.c
> +++ b/arch/arm/mach-omap2/irq.c
> @@ -314,6 +314,8 @@ static int __init intc_of_init(struct device_node *node,
>  
>  	omap_init_irq(res.start, nr_irq, of_node_get(node));
>  
> +	set_handle_irq(omap2_intc_handle_irq);
> +
>  	return 0;
>  }
>

if you respin the patchset you may want to call omap_intc_handle_irq
directly. It makes the review of the patchset less confusing.

(I was wondering why omap3 can call omap2_intc_handle_irq until I
noticed, that your previous changes made both functions simple
wrapper functions for omap_intc_handle_irq)

-- Sebastian
Felipe Balbi July 29, 2014, 3:36 p.m. UTC | #2
On Tue, Jul 29, 2014 at 04:20:20AM +0200, Sebastian Reichel wrote:
> Hi,
> 
> On Mon, Jul 28, 2014 at 04:16:01PM -0500, Felipe Balbi wrote:
> > this will let us drop .handle_irq and .init_irq fields
> > from our generic machine_descs.
> > 
> > Signed-off-by: Felipe Balbi <balbi@ti.com>
> > ---
> >  arch/arm/mach-omap2/irq.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
> > index e6997c5..e452411 100644
> > --- a/arch/arm/mach-omap2/irq.c
> > +++ b/arch/arm/mach-omap2/irq.c
> > @@ -314,6 +314,8 @@ static int __init intc_of_init(struct device_node *node,
> >  
> >  	omap_init_irq(res.start, nr_irq, of_node_get(node));
> >  
> > +	set_handle_irq(omap2_intc_handle_irq);
> > +
> >  	return 0;
> >  }
> >
> 
> if you respin the patchset you may want to call omap_intc_handle_irq
> directly. It makes the review of the patchset less confusing.
> 
> (I was wondering why omap3 can call omap2_intc_handle_irq until I
> noticed, that your previous changes made both functions simple
> wrapper functions for omap_intc_handle_irq)

this is done later for a reason. At this point, omap_intc_handle_irq()
still misses proper annotations for asmlinkage and
__exception_irq_entry.
Sebastian Reichel July 29, 2014, 4 p.m. UTC | #3
Hi,

On Tue, Jul 29, 2014 at 10:36:49AM -0500, Felipe Balbi wrote:
> On Tue, Jul 29, 2014 at 04:20:20AM +0200, Sebastian Reichel wrote:
> > Hi,
> > 
> > On Mon, Jul 28, 2014 at 04:16:01PM -0500, Felipe Balbi wrote:
> > > this will let us drop .handle_irq and .init_irq fields
> > > from our generic machine_descs.
> > > 
> > > Signed-off-by: Felipe Balbi <balbi@ti.com>
> > > ---
> > >  arch/arm/mach-omap2/irq.c | 2 ++
> > >  1 file changed, 2 insertions(+)
> > > 
> > > diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
> > > index e6997c5..e452411 100644
> > > --- a/arch/arm/mach-omap2/irq.c
> > > +++ b/arch/arm/mach-omap2/irq.c
> > > @@ -314,6 +314,8 @@ static int __init intc_of_init(struct device_node *node,
> > >  
> > >  	omap_init_irq(res.start, nr_irq, of_node_get(node));
> > >  
> > > +	set_handle_irq(omap2_intc_handle_irq);
> > > +
> > >  	return 0;
> > >  }
> > >
> > 
> > if you respin the patchset you may want to call omap_intc_handle_irq
> > directly. It makes the review of the patchset less confusing.
> > 
> > (I was wondering why omap3 can call omap2_intc_handle_irq until I
> > noticed, that your previous changes made both functions simple
> > wrapper functions for omap_intc_handle_irq)
> 
> this is done later for a reason. At this point, omap_intc_handle_irq()
> still misses proper annotations for asmlinkage and
> __exception_irq_entry.

I guess that could be solved by moving the annotations to
omap_intc_handle_irq and just keeping omap{23}_intc_handle_irq as a
#define. Probably not worth the extra work, though.

-- Sebastian
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index e6997c5..e452411 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -314,6 +314,8 @@  static int __init intc_of_init(struct device_node *node,
 
 	omap_init_irq(res.start, nr_irq, of_node_get(node));
 
+	set_handle_irq(omap2_intc_handle_irq);
+
 	return 0;
 }