Andrew Cooper
2013-Aug-06 17:42 UTC
[PATCH] xen: cleanup unused request{_dt, }_irq() parameter
The irqflags parameter appears to be an unused vestigial parameter right from
the integration of the IOMMU code in 2007. The parameter is 0 at all
callsites and never used.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Keir Fraser <keir@xen.org>
CC: Jan Beulich <JBeulich@suse.com>
CC: Tim Deegan <tim@xen.org>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Stefano Stabellini <Stefano.Stabellini@eu.citrix.com>
---
The arm tree picked this up when copying from x86. I have checked the x86
compilation but don''t have an arm compiler to hand. `git grep`
indicates that
I have found all callsites.
---
xen/arch/arm/gic.c | 2 +-
xen/arch/arm/irq.c | 2 +-
xen/arch/arm/time.c | 6 +++---
xen/arch/x86/hpet.c | 2 +-
xen/arch/x86/irq.c | 2 +-
xen/drivers/passthrough/amd/iommu_init.c | 2 +-
xen/drivers/passthrough/vtd/iommu.c | 2 +-
xen/include/asm-arm/irq.h | 3 +--
xen/include/xen/irq.h | 2 +-
9 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c
index ccce565..7c24811 100644
--- a/xen/arch/arm/gic.c
+++ b/xen/arch/arm/gic.c
@@ -893,7 +893,7 @@ void gic_dump_info(struct vcpu *v)
void __cpuinit init_maintenance_interrupt(void)
{
request_dt_irq(&gic.maintenance, maintenance_interrupt,
- 0, "irq-maintenance", NULL);
+ "irq-maintenance", NULL);
}
/*
diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
index 2fe4296..3e326b0 100644
--- a/xen/arch/arm/irq.c
+++ b/xen/arch/arm/irq.c
@@ -95,7 +95,7 @@ void __cpuinit init_secondary_IRQ(void)
int __init request_dt_irq(const struct dt_irq *irq,
void (*handler)(int, void *, struct cpu_user_regs *),
- unsigned long irqflags, const char *devname, void *dev_id)
+ const char *devname, void *dev_id)
{
struct irqaction *action;
int retval;
diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c
index 4ed7882..b5864ef 100644
--- a/xen/arch/arm/time.c
+++ b/xen/arch/arm/time.c
@@ -238,11 +238,11 @@ void __cpuinit init_timer_interrupt(void)
WRITE_SYSREG32(0, CNTHP_CTL_EL2); /* Hypervisor''s timer disabled
*/
isb();
- request_dt_irq(&timer_irq[TIMER_HYP_PPI], timer_interrupt, 0,
+ request_dt_irq(&timer_irq[TIMER_HYP_PPI], timer_interrupt,
"hyptimer", NULL);
- request_dt_irq(&timer_irq[TIMER_VIRT_PPI], vtimer_interrupt, 0,
+ request_dt_irq(&timer_irq[TIMER_VIRT_PPI], vtimer_interrupt,
"virtimer", NULL);
- request_dt_irq(&timer_irq[TIMER_PHYS_NONSECURE_PPI], timer_interrupt,
0,
+ request_dt_irq(&timer_irq[TIMER_PHYS_NONSECURE_PPI], timer_interrupt,
"phytimer", NULL);
}
diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c
index 946d133..7e0d332 100644
--- a/xen/arch/x86/hpet.c
+++ b/xen/arch/x86/hpet.c
@@ -355,7 +355,7 @@ static int __init hpet_setup_msi_irq(struct
hpet_event_channel *ch)
hpet_write32(cfg, HPET_Tn_CFG(ch->idx));
desc->handler = &hpet_msi_type;
- ret = request_irq(ch->msi.irq, hpet_interrupt_handler, 0,
"HPET", ch);
+ ret = request_irq(ch->msi.irq, hpet_interrupt_handler, "HPET",
ch);
if ( ret >= 0 )
ret = __hpet_setup_msi_irq(desc);
if ( ret < 0 )
diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c
index a4da786..97292fd 100644
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -951,7 +951,7 @@ __initcall(irq_ratelimit_init);
int __init request_irq(unsigned int irq,
void (*handler)(int, void *, struct cpu_user_regs *),
- unsigned long irqflags, const char * devname, void *dev_id)
+ const char * devname, void *dev_id)
{
struct irqaction * action;
int retval;
diff --git a/xen/drivers/passthrough/amd/iommu_init.c
b/xen/drivers/passthrough/amd/iommu_init.c
index c19b51d..b431d16 100644
--- a/xen/drivers/passthrough/amd/iommu_init.c
+++ b/xen/drivers/passthrough/amd/iommu_init.c
@@ -814,7 +814,7 @@ static bool_t __init set_iommu_interrupt_handler(struct
amd_iommu *iommu)
handler = &iommu_msi_type;
ret = __setup_msi_irq(irq_to_desc(irq), &iommu->msi, handler);
if ( !ret )
- ret = request_irq(irq, iommu_interrupt_handler, 0,
"amd_iommu", iommu);
+ ret = request_irq(irq, iommu_interrupt_handler, "amd_iommu",
iommu);
if ( ret )
{
destroy_irq(irq);
diff --git a/xen/drivers/passthrough/vtd/iommu.c
b/xen/drivers/passthrough/vtd/iommu.c
index 76f7b8e..ddf713b 100644
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -1098,7 +1098,7 @@ static int __init iommu_set_interrupt(struct
acpi_drhd_unit *drhd)
desc = irq_to_desc(irq);
desc->handler = &dma_msi_type;
- ret = request_irq(irq, iommu_page_fault, 0, "dmar", iommu);
+ ret = request_irq(irq, iommu_page_fault, "dmar", iommu);
if ( ret )
{
desc->handler = &no_irq_type;
diff --git a/xen/include/asm-arm/irq.h b/xen/include/asm-arm/irq.h
index 80ff68d..7c20703 100644
--- a/xen/include/asm-arm/irq.h
+++ b/xen/include/asm-arm/irq.h
@@ -42,8 +42,7 @@ void init_secondary_IRQ(void);
int __init request_dt_irq(const struct dt_irq *irq,
void (*handler)(int, void *, struct cpu_user_regs *),
- unsigned long irqflags, const char *devname,
- void *dev_id);
+ const char *devname, void *dev_id);
int __init setup_dt_irq(const struct dt_irq *irq, struct irqaction *new);
#endif /* _ASM_HW_IRQ_H */
diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h
index eaf1a84..f2e6215 100644
--- a/xen/include/xen/irq.h
+++ b/xen/include/xen/irq.h
@@ -93,7 +93,7 @@ extern int setup_irq(unsigned int irq, struct irqaction *);
extern void release_irq(unsigned int irq);
extern int request_irq(unsigned int irq,
void (*handler)(int, void *, struct cpu_user_regs *),
- unsigned long irqflags, const char * devname, void *dev_id);
+ const char * devname, void *dev_id);
extern hw_irq_controller no_irq_type;
extern void no_action(int cpl, void *dev_id, struct cpu_user_regs *regs);
--
1.7.10.4
Jan Beulich
2013-Aug-07 07:42 UTC
Re: [PATCH] xen: cleanup unused request{_dt, }_irq() parameter
>>> On 06.08.13 at 19:42, Andrew Cooper <andrew.cooper3@citrix.com> wrote: > The irqflags parameter appears to be an unused vestigial parameter right from > the integration of the IOMMU code in 2007. The parameter is 0 at all > callsites and never used. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>Reviewed-by: Jan Beulich <JBeulich@suse.com> If I were to commit it - with the appropriate acks - I''d also cleanup the white space damage left in place:> --- a/xen/arch/x86/irq.c > +++ b/xen/arch/x86/irq.c > @@ -951,7 +951,7 @@ __initcall(irq_ratelimit_init); > > int __init request_irq(unsigned int irq, > void (*handler)(int, void *, struct cpu_user_regs *), > - unsigned long irqflags, const char * devname, void *dev_id) > + const char * devname, void *dev_id)Here ...> --- a/xen/include/xen/irq.h > +++ b/xen/include/xen/irq.h > @@ -93,7 +93,7 @@ extern int setup_irq(unsigned int irq, struct irqaction *); > extern void release_irq(unsigned int irq); > extern int request_irq(unsigned int irq, > void (*handler)(int, void *, struct cpu_user_regs *), > - unsigned long irqflags, const char * devname, void *dev_id); > + const char * devname, void *dev_id);... and here. I''d encourage you to in the future do such obvious cleanup on code you touch anyway. Jan
Ian Campbell
2013-Aug-07 08:33 UTC
Re: [PATCH] xen: cleanup unused request{_dt, }_irq() parameter
On Tue, 2013-08-06 at 18:42 +0100, Andrew Cooper wrote:> The irqflags parameter appears to be an unused vestigial parameter right from > the integration of the IOMMU code in 2007. The parameter is 0 at all > callsites and never used. > > Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > CC: Keir Fraser <keir@xen.org> > CC: Jan Beulich <JBeulich@suse.com> > CC: Tim Deegan <tim@xen.org>Acked-by: Ian Campbell <Ian.Campbell@citrix.com> I''ll assume that one of the core/generic/x86 committers will take this unless one of them tells me otherwise.> CC: Stefano Stabellini <Stefano.Stabellini@eu.citrix.com> > > --- > > The arm tree picked this up when copying from x86. I have checked the x86 > compilation but don''t have an arm compiler to hand. `git grep` indicates that > I have found all callsites. > --- > xen/arch/arm/gic.c | 2 +- > xen/arch/arm/irq.c | 2 +- > xen/arch/arm/time.c | 6 +++--- > xen/arch/x86/hpet.c | 2 +- > xen/arch/x86/irq.c | 2 +- > xen/drivers/passthrough/amd/iommu_init.c | 2 +- > xen/drivers/passthrough/vtd/iommu.c | 2 +- > xen/include/asm-arm/irq.h | 3 +-- > xen/include/xen/irq.h | 2 +- > 9 files changed, 11 insertions(+), 12 deletions(-) > > diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c > index ccce565..7c24811 100644 > --- a/xen/arch/arm/gic.c > +++ b/xen/arch/arm/gic.c > @@ -893,7 +893,7 @@ void gic_dump_info(struct vcpu *v) > void __cpuinit init_maintenance_interrupt(void) > { > request_dt_irq(&gic.maintenance, maintenance_interrupt, > - 0, "irq-maintenance", NULL); > + "irq-maintenance", NULL); > } > > /* > diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c > index 2fe4296..3e326b0 100644 > --- a/xen/arch/arm/irq.c > +++ b/xen/arch/arm/irq.c > @@ -95,7 +95,7 @@ void __cpuinit init_secondary_IRQ(void) > > int __init request_dt_irq(const struct dt_irq *irq, > void (*handler)(int, void *, struct cpu_user_regs *), > - unsigned long irqflags, const char *devname, void *dev_id) > + const char *devname, void *dev_id) > { > struct irqaction *action; > int retval; > diff --git a/xen/arch/arm/time.c b/xen/arch/arm/time.c > index 4ed7882..b5864ef 100644 > --- a/xen/arch/arm/time.c > +++ b/xen/arch/arm/time.c > @@ -238,11 +238,11 @@ void __cpuinit init_timer_interrupt(void) > WRITE_SYSREG32(0, CNTHP_CTL_EL2); /* Hypervisor''s timer disabled */ > isb(); > > - request_dt_irq(&timer_irq[TIMER_HYP_PPI], timer_interrupt, 0, > + request_dt_irq(&timer_irq[TIMER_HYP_PPI], timer_interrupt, > "hyptimer", NULL); > - request_dt_irq(&timer_irq[TIMER_VIRT_PPI], vtimer_interrupt, 0, > + request_dt_irq(&timer_irq[TIMER_VIRT_PPI], vtimer_interrupt, > "virtimer", NULL); > - request_dt_irq(&timer_irq[TIMER_PHYS_NONSECURE_PPI], timer_interrupt, 0, > + request_dt_irq(&timer_irq[TIMER_PHYS_NONSECURE_PPI], timer_interrupt, > "phytimer", NULL); > } > > diff --git a/xen/arch/x86/hpet.c b/xen/arch/x86/hpet.c > index 946d133..7e0d332 100644 > --- a/xen/arch/x86/hpet.c > +++ b/xen/arch/x86/hpet.c > @@ -355,7 +355,7 @@ static int __init hpet_setup_msi_irq(struct hpet_event_channel *ch) > hpet_write32(cfg, HPET_Tn_CFG(ch->idx)); > > desc->handler = &hpet_msi_type; > - ret = request_irq(ch->msi.irq, hpet_interrupt_handler, 0, "HPET", ch); > + ret = request_irq(ch->msi.irq, hpet_interrupt_handler, "HPET", ch); > if ( ret >= 0 ) > ret = __hpet_setup_msi_irq(desc); > if ( ret < 0 ) > diff --git a/xen/arch/x86/irq.c b/xen/arch/x86/irq.c > index a4da786..97292fd 100644 > --- a/xen/arch/x86/irq.c > +++ b/xen/arch/x86/irq.c > @@ -951,7 +951,7 @@ __initcall(irq_ratelimit_init); > > int __init request_irq(unsigned int irq, > void (*handler)(int, void *, struct cpu_user_regs *), > - unsigned long irqflags, const char * devname, void *dev_id) > + const char * devname, void *dev_id) > { > struct irqaction * action; > int retval; > diff --git a/xen/drivers/passthrough/amd/iommu_init.c b/xen/drivers/passthrough/amd/iommu_init.c > index c19b51d..b431d16 100644 > --- a/xen/drivers/passthrough/amd/iommu_init.c > +++ b/xen/drivers/passthrough/amd/iommu_init.c > @@ -814,7 +814,7 @@ static bool_t __init set_iommu_interrupt_handler(struct amd_iommu *iommu) > handler = &iommu_msi_type; > ret = __setup_msi_irq(irq_to_desc(irq), &iommu->msi, handler); > if ( !ret ) > - ret = request_irq(irq, iommu_interrupt_handler, 0, "amd_iommu", iommu); > + ret = request_irq(irq, iommu_interrupt_handler, "amd_iommu", iommu); > if ( ret ) > { > destroy_irq(irq); > diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c > index 76f7b8e..ddf713b 100644 > --- a/xen/drivers/passthrough/vtd/iommu.c > +++ b/xen/drivers/passthrough/vtd/iommu.c > @@ -1098,7 +1098,7 @@ static int __init iommu_set_interrupt(struct acpi_drhd_unit *drhd) > > desc = irq_to_desc(irq); > desc->handler = &dma_msi_type; > - ret = request_irq(irq, iommu_page_fault, 0, "dmar", iommu); > + ret = request_irq(irq, iommu_page_fault, "dmar", iommu); > if ( ret ) > { > desc->handler = &no_irq_type; > diff --git a/xen/include/asm-arm/irq.h b/xen/include/asm-arm/irq.h > index 80ff68d..7c20703 100644 > --- a/xen/include/asm-arm/irq.h > +++ b/xen/include/asm-arm/irq.h > @@ -42,8 +42,7 @@ void init_secondary_IRQ(void); > > int __init request_dt_irq(const struct dt_irq *irq, > void (*handler)(int, void *, struct cpu_user_regs *), > - unsigned long irqflags, const char *devname, > - void *dev_id); > + const char *devname, void *dev_id); > int __init setup_dt_irq(const struct dt_irq *irq, struct irqaction *new); > > #endif /* _ASM_HW_IRQ_H */ > diff --git a/xen/include/xen/irq.h b/xen/include/xen/irq.h > index eaf1a84..f2e6215 100644 > --- a/xen/include/xen/irq.h > +++ b/xen/include/xen/irq.h > @@ -93,7 +93,7 @@ extern int setup_irq(unsigned int irq, struct irqaction *); > extern void release_irq(unsigned int irq); > extern int request_irq(unsigned int irq, > void (*handler)(int, void *, struct cpu_user_regs *), > - unsigned long irqflags, const char * devname, void *dev_id); > + const char * devname, void *dev_id); > > extern hw_irq_controller no_irq_type; > extern void no_action(int cpl, void *dev_id, struct cpu_user_regs *regs);
Andrew Cooper
2013-Aug-07 11:59 UTC
Re: [PATCH] xen: cleanup unused request{_dt, }_irq() parameter
On 07/08/13 08:42, Jan Beulich wrote:>>>> On 06.08.13 at 19:42, Andrew Cooper <andrew.cooper3@citrix.com> wrote: >> The irqflags parameter appears to be an unused vestigial parameter right from >> the integration of the IOMMU code in 2007. The parameter is 0 at all >> callsites and never used. >> >> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> > Reviewed-by: Jan Beulich <JBeulich@suse.com> > > If I were to commit it - with the appropriate acks - I''d also cleanup > the white space damage left in place: > >> --- a/xen/arch/x86/irq.c >> +++ b/xen/arch/x86/irq.c >> @@ -951,7 +951,7 @@ __initcall(irq_ratelimit_init); >> >> int __init request_irq(unsigned int irq, >> void (*handler)(int, void *, struct cpu_user_regs *), >> - unsigned long irqflags, const char * devname, void *dev_id) >> + const char * devname, void *dev_id) > Here ... > >> --- a/xen/include/xen/irq.h >> +++ b/xen/include/xen/irq.h >> @@ -93,7 +93,7 @@ extern int setup_irq(unsigned int irq, struct irqaction *); >> extern void release_irq(unsigned int irq); >> extern int request_irq(unsigned int irq, >> void (*handler)(int, void *, struct cpu_user_regs *), >> - unsigned long irqflags, const char * devname, void *dev_id); >> + const char * devname, void *dev_id); > ... and here. > > I''d encourage you to in the future do such obvious cleanup on > code you touch anyway. > > Jan >Certainly (I tend to, but it slipped my mind this time) - I shall submit v2 ~Andrew
Jan Beulich
2013-Aug-07 12:09 UTC
Re: [PATCH] xen: cleanup unused request{_dt, }_irq() parameter
>>> On 07.08.13 at 13:59, Andrew Cooper <andrew.cooper3@citrix.com> wrote: > On 07/08/13 08:42, Jan Beulich wrote: >>>>> On 06.08.13 at 19:42, Andrew Cooper <andrew.cooper3@citrix.com> wrote: >>> The irqflags parameter appears to be an unused vestigial parameter right > from >>> the integration of the IOMMU code in 2007. The parameter is 0 at all >>> callsites and never used. >>> >>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> >> Reviewed-by: Jan Beulich <JBeulich@suse.com> >> >> If I were to commit it - with the appropriate acks - I''d also cleanup >> the white space damage left in place: >> >>> --- a/xen/arch/x86/irq.c >>> +++ b/xen/arch/x86/irq.c >>> @@ -951,7 +951,7 @@ __initcall(irq_ratelimit_init); >>> >>> int __init request_irq(unsigned int irq, >>> void (*handler)(int, void *, struct cpu_user_regs *), >>> - unsigned long irqflags, const char * devname, void *dev_id) >>> + const char * devname, void *dev_id) >> Here ... >> >>> --- a/xen/include/xen/irq.h >>> +++ b/xen/include/xen/irq.h >>> @@ -93,7 +93,7 @@ extern int setup_irq(unsigned int irq, struct irqaction *); >>> extern void release_irq(unsigned int irq); >>> extern int request_irq(unsigned int irq, >>> void (*handler)(int, void *, struct cpu_user_regs *), >>> - unsigned long irqflags, const char * devname, void *dev_id); >>> + const char * devname, void *dev_id); >> ... and here. >> >> I''d encourage you to in the future do such obvious cleanup on >> code you touch anyway. >> >> Jan >> > > Certainly (I tend to, but it slipped my mind this time) - I shall submit v2No need to do so - as said, if I''m going to be the one to apply this (likely), I''ll do that cleanup as I go. Jan
Andrew Cooper
2013-Aug-07 12:13 UTC
Re: [PATCH] xen: cleanup unused request{_dt, }_irq() parameter
On 07/08/13 13:09, Jan Beulich wrote:>>>> On 07.08.13 at 13:59, Andrew Cooper <andrew.cooper3@citrix.com> wrote: >> On 07/08/13 08:42, Jan Beulich wrote: >>>>>> On 06.08.13 at 19:42, Andrew Cooper <andrew.cooper3@citrix.com> wrote: >>>> The irqflags parameter appears to be an unused vestigial parameter right >> from >>>> the integration of the IOMMU code in 2007. The parameter is 0 at all >>>> callsites and never used. >>>> >>>> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com> >>> Reviewed-by: Jan Beulich <JBeulich@suse.com> >>> >>> If I were to commit it - with the appropriate acks - I''d also cleanup >>> the white space damage left in place: >>> >>>> --- a/xen/arch/x86/irq.c >>>> +++ b/xen/arch/x86/irq.c >>>> @@ -951,7 +951,7 @@ __initcall(irq_ratelimit_init); >>>> >>>> int __init request_irq(unsigned int irq, >>>> void (*handler)(int, void *, struct cpu_user_regs *), >>>> - unsigned long irqflags, const char * devname, void *dev_id) >>>> + const char * devname, void *dev_id) >>> Here ... >>> >>>> --- a/xen/include/xen/irq.h >>>> +++ b/xen/include/xen/irq.h >>>> @@ -93,7 +93,7 @@ extern int setup_irq(unsigned int irq, struct irqaction *); >>>> extern void release_irq(unsigned int irq); >>>> extern int request_irq(unsigned int irq, >>>> void (*handler)(int, void *, struct cpu_user_regs *), >>>> - unsigned long irqflags, const char * devname, void *dev_id); >>>> + const char * devname, void *dev_id); >>> ... and here. >>> >>> I''d encourage you to in the future do such obvious cleanup on >>> code you touch anyway. >>> >>> Jan >>> >> Certainly (I tend to, but it slipped my mind this time) - I shall submit v2 > No need to do so - as said, if I''m going to be the one to apply this > (likely), I''ll do that cleanup as I go. > > Jan >Ok - thanks. ~Andrew