| Message ID | 1396968247-8768-17-git-send-email-julien.grall@linaro.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
>>> On 08.04.14 at 16:44, <julien.grall@linaro.org> wrote: > The new parameter (dev_id) will be used in on ARM to release the right > action when support for multiple action is added. > > Even if this function is declared in common code, no one is using it. So > it's > safe to modify the prototype also for x86. > > Signed-off-by: Julien Grall <julien.grall@linaro.org> x86 part: Acked-by: Jan Beulich <jbeulich@suse.com> > > --- > Changes in v3: > - Fix typoes in commit message > - Don't remove __init on release_irq for x86 > > Changes in v2: > - Patch added > --- > xen/arch/arm/irq.c | 2 +- > xen/arch/x86/irq.c | 2 +- > xen/include/xen/irq.h | 2 +- > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c > index 5db474f..598f2b4 100644 > --- a/xen/arch/arm/irq.c > +++ b/xen/arch/arm/irq.c > @@ -213,7 +213,7 @@ out_no_end: > irq_exit(); > } > > -void release_irq(unsigned int irq) > +void release_irq(unsigned int irq, const void *dev_id) > { > struct irq_desc *desc; > unsigned long flags; > diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c > index 88444be..eb8dcb2 100644 > --- a/xen/arch/x86/irq.c > +++ b/xen/arch/x86/irq.c > @@ -983,7 +983,7 @@ int __init request_irq(unsigned int irq, > return retval; > } > > -void __init release_irq(unsigned int irq) > +void __init release_irq(unsigned int irq, const void *dev_id) > { > struct irq_desc *desc; > unsigned long flags; > diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h > index f2e6215..1f8bdb3 100644 > --- a/xen/include/xen/irq.h > +++ b/xen/include/xen/irq.h > @@ -90,7 +90,7 @@ int arch_init_one_irq_desc(struct irq_desc *); > #define irq_desc_initialized(desc) ((desc)->handler != NULL) > > extern int setup_irq(unsigned int irq, struct irqaction *); > -extern void release_irq(unsigned int irq); > +extern void release_irq(unsigned int irq, const void *dev_id); > extern int request_irq(unsigned int irq, > void (*handler)(int, void *, struct cpu_user_regs *), > const char * devname, void *dev_id); > -- > 1.7.10.4
On Tue, 2014-04-08 at 15:44 +0100, Julien Grall wrote: > The new parameter (dev_id) will be used in on ARM to release the right > action when support for multiple action is added. > > Even if this function is declared in common code, no one is using it. So it's > safe to modify the prototype also for x86. > > Signed-off-by: Julien Grall <julien.grall@linaro.org> > Cc: Jan Beulich <jbeulich@suse.com> Acked-by: Ian Campbell <ian.campbell@citrix.com>
diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c index 5db474f..598f2b4 100644 --- a/xen/arch/arm/irq.c +++ b/xen/arch/arm/irq.c @@ -213,7 +213,7 @@ out_no_end: irq_exit(); } -void release_irq(unsigned int irq) +void release_irq(unsigned int irq, const void *dev_id) { struct irq_desc *desc; unsigned long flags; diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c index 88444be..eb8dcb2 100644 --- a/xen/arch/x86/irq.c +++ b/xen/arch/x86/irq.c @@ -983,7 +983,7 @@ int __init request_irq(unsigned int irq, return retval; } -void __init release_irq(unsigned int irq) +void __init release_irq(unsigned int irq, const void *dev_id) { struct irq_desc *desc; unsigned long flags; diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h index f2e6215..1f8bdb3 100644 --- a/xen/include/xen/irq.h +++ b/xen/include/xen/irq.h @@ -90,7 +90,7 @@ int arch_init_one_irq_desc(struct irq_desc *); #define irq_desc_initialized(desc) ((desc)->handler != NULL) extern int setup_irq(unsigned int irq, struct irqaction *); -extern void release_irq(unsigned int irq); +extern void release_irq(unsigned int irq, const void *dev_id); extern int request_irq(unsigned int irq, void (*handler)(int, void *, struct cpu_user_regs *), const char * devname, void *dev_id);
The new parameter (dev_id) will be used in on ARM to release the right action when support for multiple action is added. Even if this function is declared in common code, no one is using it. So it's safe to modify the prototype also for x86. Signed-off-by: Julien Grall <julien.grall@linaro.org> Cc: Jan Beulich <jbeulich@suse.com> --- Changes in v3: - Fix typoes in commit message - Don't remove __init on release_irq for x86 Changes in v2: - Patch added --- xen/arch/arm/irq.c | 2 +- xen/arch/x86/irq.c | 2 +- xen/include/xen/irq.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)