| Message ID | 1390581822-32624-6-git-send-email-julien.grall@linaro.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Fri, 2014-01-24 at 16:43 +0000, Julien Grall wrote: Subject: s/in/to/ > Rename the function and make the prototype consistent with request_dt_irq. > > The new parameter (dev_id) will be used in a later patch to release the right > action when the support for multiple action will be added. > > Signed-off-by: Julien Grall <julien.grall@linaro.org> Acked-by: Ian Campbell <ian.campbell@citrix.com> > --- > xen/arch/arm/gic.c | 4 ++-- > xen/include/asm-arm/irq.h | 1 + > 2 files changed, 3 insertions(+), 2 deletions(-) > > diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c > index 58bcba3..2643b46 100644 > --- a/xen/arch/arm/gic.c > +++ b/xen/arch/arm/gic.c > @@ -520,13 +520,13 @@ void gic_disable_cpu(void) > spin_unlock(&gic.lock); > } > > -void __init release_irq(unsigned int irq) > +void release_dt_irq(const struct dt_irq *irq, const void *dev_id) > { > struct irq_desc *desc; > unsigned long flags; > struct irqaction *action; > > - desc = irq_to_desc(irq); > + desc = irq_to_desc(irq->irq); > > desc->handler->shutdown(desc); > > diff --git a/xen/include/asm-arm/irq.h b/xen/include/asm-arm/irq.h > index 7c20703..bd8aac1 100644 > --- a/xen/include/asm-arm/irq.h > +++ b/xen/include/asm-arm/irq.h > @@ -44,6 +44,7 @@ int __init request_dt_irq(const struct dt_irq *irq, > void (*handler)(int, void *, struct cpu_user_regs *), > const char *devname, void *dev_id); > int __init setup_dt_irq(const struct dt_irq *irq, struct irqaction *new); This patch implies that things can now be dynamically registered and unregistered -- does this therefore need to become non-__init? > +void release_dt_irq(const struct dt_irq *irq, const void *dev_id); > > #endif /* _ASM_HW_IRQ_H */ > /*
Hi Ian, On 02/19/2014 11:47 AM, Ian Campbell wrote: > On Fri, 2014-01-24 at 16:43 +0000, Julien Grall wrote: > > Subject: s/in/to/ > >> Rename the function and make the prototype consistent with request_dt_irq. >> >> The new parameter (dev_id) will be used in a later patch to release the right >> action when the support for multiple action will be added. >> >> Signed-off-by: Julien Grall <julien.grall@linaro.org> > > Acked-by: Ian Campbell <ian.campbell@citrix.com> Thanks. >> --- >> xen/arch/arm/gic.c | 4 ++-- >> xen/include/asm-arm/irq.h | 1 + >> 2 files changed, 3 insertions(+), 2 deletions(-) >> >> diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c >> index 58bcba3..2643b46 100644 >> --- a/xen/arch/arm/gic.c >> +++ b/xen/arch/arm/gic.c >> @@ -520,13 +520,13 @@ void gic_disable_cpu(void) >> spin_unlock(&gic.lock); >> } >> >> -void __init release_irq(unsigned int irq) >> +void release_dt_irq(const struct dt_irq *irq, const void *dev_id) >> { >> struct irq_desc *desc; >> unsigned long flags; >> struct irqaction *action; >> >> - desc = irq_to_desc(irq); >> + desc = irq_to_desc(irq->irq); >> >> desc->handler->shutdown(desc); >> >> diff --git a/xen/include/asm-arm/irq.h b/xen/include/asm-arm/irq.h >> index 7c20703..bd8aac1 100644 >> --- a/xen/include/asm-arm/irq.h >> +++ b/xen/include/asm-arm/irq.h >> @@ -44,6 +44,7 @@ int __init request_dt_irq(const struct dt_irq *irq, >> void (*handler)(int, void *, struct cpu_user_regs *), >> const char *devname, void *dev_id); >> int __init setup_dt_irq(const struct dt_irq *irq, struct irqaction *new); > > This patch implies that things can now be dynamically registered and > unregistered -- does this therefore need to become non-__init? Yes, I noticed that after I sent this patch series. I have a patch for that which I will add on the next version. Cheers,
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index 58bcba3..2643b46 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -520,13 +520,13 @@ void gic_disable_cpu(void) spin_unlock(&gic.lock); } -void __init release_irq(unsigned int irq) +void release_dt_irq(const struct dt_irq *irq, const void *dev_id) { struct irq_desc *desc; unsigned long flags; struct irqaction *action; - desc = irq_to_desc(irq); + desc = irq_to_desc(irq->irq); desc->handler->shutdown(desc); diff --git a/xen/include/asm-arm/irq.h b/xen/include/asm-arm/irq.h index 7c20703..bd8aac1 100644 --- a/xen/include/asm-arm/irq.h +++ b/xen/include/asm-arm/irq.h @@ -44,6 +44,7 @@ int __init request_dt_irq(const struct dt_irq *irq, void (*handler)(int, void *, struct cpu_user_regs *), const char *devname, void *dev_id); int __init setup_dt_irq(const struct dt_irq *irq, struct irqaction *new); +void release_dt_irq(const struct dt_irq *irq, const void *dev_id); #endif /* _ASM_HW_IRQ_H */ /*
Rename the function and make the prototype consistent with request_dt_irq. The new parameter (dev_id) will be used in a later patch to release the right action when the support for multiple action will be added. Signed-off-by: Julien Grall <julien.grall@linaro.org> --- xen/arch/arm/gic.c | 4 ++-- xen/include/asm-arm/irq.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)