| Message ID | cbc4859788bd30d6ddc9d9483ed641d6f2d0fd42.1582471508.git.afzal.mohd.ma@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | genirq: Remove setup_irq() | expand |
On Mon, Feb 24, 2020 at 06:19:04AM +0530, afzal mohammed wrote: > request_irq() is preferred over setup_irq(). The early boot setup_irq() > invocations happen either via 'init_IRQ()' or 'time_init()', while > memory allocators are ready by 'mm_init()'. > > Per tglx[1], setup_irq() existed in olden days when allocators were not > ready by the time early interrupts were initialized. > > Hence replace setup_irq() by request_irq(). > > Seldom remove_irq() usage has been observed coupled with setup_irq(), > wherever that has been found, it too has been replaced by free_irq(). > > [1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos > > Signed-off-by: afzal mohammed <afzal.mohd.ma@gmail.com> > Acked-by: Viresh Kumar <viresh.kumar@linaro.org> > Acked-by: Alexander Sverdlin <alexander.sverdlin@gmail.com> # EP93xx > Tested-by: Alexander Sverdlin <alexander.sverdlin@gmail.com> # EP93xx > --- > > v2: > * Replace pr_err("request_irq() on %s failed" by > pr_err("%s: request_irq() failed" > * Commit message massage > > arch/arm/mach-cns3xxx/core.c | 10 +++------- > arch/arm/mach-ebsa110/core.c | 10 +++------- > arch/arm/mach-ep93xx/timer-ep93xx.c | 12 ++++-------- > arch/arm/mach-footbridge/dc21285-timer.c | 11 +++-------- > arch/arm/mach-footbridge/isa-irq.c | 8 ++------ > arch/arm/mach-footbridge/isa-timer.c | 11 +++-------- > arch/arm/mach-iop32x/time.c | 12 ++++-------- > arch/arm/mach-mmp/time.c | 11 +++-------- Tested-by: Lubomir Rintel <lkundrak@v3.sk> (mmp) Thanks, Lubo > arch/arm/mach-omap1/pm.c | 22 +++++++++++++--------- > arch/arm/mach-omap1/time.c | 10 +++------- > arch/arm/mach-omap1/timer32k.c | 10 +++------- > arch/arm/mach-omap2/timer.c | 11 +++-------- > arch/arm/mach-rpc/time.c | 8 ++------ > arch/arm/mach-spear/time.c | 9 ++------- > arch/arm/plat-orion/time.c | 10 +++------- > 15 files changed, 54 insertions(+), 111 deletions(-) > > diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c > index 1d61a7701c11..711d88b64f2e 100644 > --- a/arch/arm/mach-cns3xxx/core.c > +++ b/arch/arm/mach-cns3xxx/core.c > @@ -189,12 +189,6 @@ static irqreturn_t cns3xxx_timer_interrupt(int irq, void *dev_id) > return IRQ_HANDLED; > } > > -static struct irqaction cns3xxx_timer_irq = { > - .name = "timer", > - .flags = IRQF_TIMER | IRQF_IRQPOLL, > - .handler = cns3xxx_timer_interrupt, > -}; > - > /* > * Set up the clock source and clock events devices > */ > @@ -245,7 +239,9 @@ static void __init __cns3xxx_timer_init(unsigned int timer_irq) > writel(val, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); > > /* Make irqs happen for the system timer */ > - setup_irq(timer_irq, &cns3xxx_timer_irq); > + if (request_irq(timer_irq, cns3xxx_timer_interrupt, > + IRQF_TIMER | IRQF_IRQPOLL, "timer", NULL)) > + pr_err("%s: request_irq() failed\n", "timer"); > > cns3xxx_clockevents_init(timer_irq); > } > diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c > index da2ff4f61d6b..dfe6da30a3e0 100644 > --- a/arch/arm/mach-ebsa110/core.c > +++ b/arch/arm/mach-ebsa110/core.c > @@ -201,12 +201,6 @@ ebsa110_timer_interrupt(int irq, void *dev_id) > return IRQ_HANDLED; > } > > -static struct irqaction ebsa110_timer_irq = { > - .name = "EBSA110 Timer Tick", > - .flags = IRQF_TIMER | IRQF_IRQPOLL, > - .handler = ebsa110_timer_interrupt, > -}; > - > /* > * Set up timer interrupt. > */ > @@ -221,7 +215,9 @@ void __init ebsa110_timer_init(void) > __raw_writeb(COUNT & 0xff, PIT_T1); > __raw_writeb(COUNT >> 8, PIT_T1); > > - setup_irq(IRQ_EBSA110_TIMER0, &ebsa110_timer_irq); > + if (request_irq(IRQ_EBSA110_TIMER0, ebsa110_timer_interrupt, > + IRQF_TIMER | IRQF_IRQPOLL, "EBSA110 Timer Tick", NULL)) > + pr_err("%s: request_irq() failed\n", "EBSA110 Timer Tick"); > } > > static struct plat_serial8250_port serial_platform_data[] = { > diff --git a/arch/arm/mach-ep93xx/timer-ep93xx.c b/arch/arm/mach-ep93xx/timer-ep93xx.c > index de998830f534..01f7e2b0b9fe 100644 > --- a/arch/arm/mach-ep93xx/timer-ep93xx.c > +++ b/arch/arm/mach-ep93xx/timer-ep93xx.c > @@ -117,13 +117,6 @@ static irqreturn_t ep93xx_timer_interrupt(int irq, void *dev_id) > return IRQ_HANDLED; > } > > -static struct irqaction ep93xx_timer_irq = { > - .name = "ep93xx timer", > - .flags = IRQF_TIMER | IRQF_IRQPOLL, > - .handler = ep93xx_timer_interrupt, > - .dev_id = &ep93xx_clockevent, > -}; > - > void __init ep93xx_timer_init(void) > { > /* Enable and register clocksource and sched_clock on timer 4 */ > @@ -136,7 +129,10 @@ void __init ep93xx_timer_init(void) > EP93XX_TIMER4_RATE); > > /* Set up clockevent on timer 3 */ > - setup_irq(IRQ_EP93XX_TIMER3, &ep93xx_timer_irq); > + if (request_irq(IRQ_EP93XX_TIMER3, ep93xx_timer_interrupt, > + IRQF_TIMER | IRQF_IRQPOLL, "ep93xx timer", > + &ep93xx_clockevent)) > + pr_err("%s: request_irq() failed\n", "ep93xx timer"); > clockevents_config_and_register(&ep93xx_clockevent, > EP93XX_TIMER123_RATE, > 1, > diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c > index f76212d2dbf1..ce70931037c0 100644 > --- a/arch/arm/mach-footbridge/dc21285-timer.c > +++ b/arch/arm/mach-footbridge/dc21285-timer.c > @@ -101,13 +101,6 @@ static irqreturn_t timer1_interrupt(int irq, void *dev_id) > return IRQ_HANDLED; > } > > -static struct irqaction footbridge_timer_irq = { > - .name = "dc21285_timer1", > - .handler = timer1_interrupt, > - .flags = IRQF_TIMER | IRQF_IRQPOLL, > - .dev_id = &ckevt_dc21285, > -}; > - > /* > * Set up timer interrupt. > */ > @@ -118,7 +111,9 @@ void __init footbridge_timer_init(void) > > clocksource_register_hz(&cksrc_dc21285, rate); > > - setup_irq(ce->irq, &footbridge_timer_irq); > + if (request_irq(ce->irq, timer1_interrupt, IRQF_TIMER | IRQF_IRQPOLL, > + "dc21285_timer1", &ckevt_dc21285)) > + pr_err("%s: request_irq() failed\n", "dc21285_timer1"); > > ce->cpumask = cpumask_of(smp_processor_id()); > clockevents_config_and_register(ce, rate, 0x4, 0xffffff); > diff --git a/arch/arm/mach-footbridge/isa-irq.c b/arch/arm/mach-footbridge/isa-irq.c > index 88a553932c33..a259d5d8eb20 100644 > --- a/arch/arm/mach-footbridge/isa-irq.c > +++ b/arch/arm/mach-footbridge/isa-irq.c > @@ -96,11 +96,6 @@ static void isa_irq_handler(struct irq_desc *desc) > generic_handle_irq(isa_irq); > } > > -static struct irqaction irq_cascade = { > - .handler = no_action, > - .name = "cascade", > -}; > - > static struct resource pic1_resource = { > .name = "pic1", > .start = 0x20, > @@ -160,7 +155,8 @@ void __init isa_init_irq(unsigned int host_irq) > > request_resource(&ioport_resource, &pic1_resource); > request_resource(&ioport_resource, &pic2_resource); > - setup_irq(IRQ_ISA_CASCADE, &irq_cascade); > + if (request_irq(IRQ_ISA_CASCADE, no_action, 0, "cascade", NULL)) > + pr_err("%s: request_irq() failed\n", "cascade"); > > irq_set_chained_handler(host_irq, isa_irq_handler); > > diff --git a/arch/arm/mach-footbridge/isa-timer.c b/arch/arm/mach-footbridge/isa-timer.c > index 82f45591fb2c..6c7c6ea03804 100644 > --- a/arch/arm/mach-footbridge/isa-timer.c > +++ b/arch/arm/mach-footbridge/isa-timer.c > @@ -25,17 +25,12 @@ static irqreturn_t pit_timer_interrupt(int irq, void *dev_id) > return IRQ_HANDLED; > } > > -static struct irqaction pit_timer_irq = { > - .name = "pit", > - .handler = pit_timer_interrupt, > - .flags = IRQF_TIMER | IRQF_IRQPOLL, > - .dev_id = &i8253_clockevent, > -}; > - > void __init isa_timer_init(void) > { > clocksource_i8253_init(); > > - setup_irq(i8253_clockevent.irq, &pit_timer_irq); > + if (request_irq(i8253_clockevent.irq, pit_timer_interrupt, > + IRQF_TIMER | IRQF_IRQPOLL, "pit", &i8253_clockevent)) > + pr_err("%s: request_irq() failed\n", "pit"); > clockevent_i8253_init(false); > } > diff --git a/arch/arm/mach-iop32x/time.c b/arch/arm/mach-iop32x/time.c > index 18a4df5c1baa..422e298366bd 100644 > --- a/arch/arm/mach-iop32x/time.c > +++ b/arch/arm/mach-iop32x/time.c > @@ -137,13 +137,6 @@ iop_timer_interrupt(int irq, void *dev_id) > return IRQ_HANDLED; > } > > -static struct irqaction iop_timer_irq = { > - .name = "IOP Timer Tick", > - .handler = iop_timer_interrupt, > - .flags = IRQF_TIMER | IRQF_IRQPOLL, > - .dev_id = &iop_clockevent, > -}; > - > static unsigned long iop_tick_rate; > unsigned long get_iop_tick_rate(void) > { > @@ -168,7 +161,10 @@ void __init iop_init_time(unsigned long tick_rate) > */ > write_tmr0(timer_ctl & ~IOP_TMR_EN); > write_tisr(1); > - setup_irq(IRQ_IOP32X_TIMER0, &iop_timer_irq); > + if (request_irq(IRQ_IOP32X_TIMER0, iop_timer_interrupt, > + IRQF_TIMER | IRQF_IRQPOLL, "IOP Timer Tick", > + &iop_clockevent)) > + pr_err("%s: request_irq() failed\n", "IOP Timer Tick"); > iop_clockevent.cpumask = cpumask_of(0); > clockevents_config_and_register(&iop_clockevent, tick_rate, > 0xf, 0xfffffffe); > diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c > index c65cfc1ad99b..83af1db45c15 100644 > --- a/arch/arm/mach-mmp/time.c > +++ b/arch/arm/mach-mmp/time.c > @@ -175,13 +175,6 @@ static void __init timer_config(void) > __raw_writel(0x2, mmp_timer_base + TMR_CER); > } > > -static struct irqaction timer_irq = { > - .name = "timer", > - .flags = IRQF_TIMER | IRQF_IRQPOLL, > - .handler = timer_interrupt, > - .dev_id = &ckevt, > -}; > - > void __init mmp_timer_init(int irq, unsigned long rate) > { > timer_config(); > @@ -190,7 +183,9 @@ void __init mmp_timer_init(int irq, unsigned long rate) > > ckevt.cpumask = cpumask_of(0); > > - setup_irq(irq, &timer_irq); > + if (request_irq(irq, timer_interrupt, IRQF_TIMER | IRQF_IRQPOLL, > + "timer", &ckevt)) > + pr_err("%s: request_irq() failed\n", "timer"); > > clocksource_register_hz(&cksrc, rate); > clockevents_config_and_register(&ckevt, rate, MIN_DELTA, MAX_DELTA); > diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c > index d068958d6f8a..a82e220783d1 100644 > --- a/arch/arm/mach-omap1/pm.c > +++ b/arch/arm/mach-omap1/pm.c > @@ -596,11 +596,6 @@ static irqreturn_t omap_wakeup_interrupt(int irq, void *dev) > return IRQ_HANDLED; > } > > -static struct irqaction omap_wakeup_irq = { > - .name = "peripheral wakeup", > - .handler = omap_wakeup_interrupt > -}; > - > > > static const struct platform_suspend_ops omap_pm_ops = { > @@ -655,10 +650,19 @@ static int __init omap_pm_init(void) > > arm_pm_idle = omap1_pm_idle; > > - if (cpu_is_omap7xx()) > - setup_irq(INT_7XX_WAKE_UP_REQ, &omap_wakeup_irq); > - else if (cpu_is_omap16xx()) > - setup_irq(INT_1610_WAKE_UP_REQ, &omap_wakeup_irq); > + if (cpu_is_omap7xx()) { > + if (request_irq(INT_7XX_WAKE_UP_REQ, omap_wakeup_interrupt, 0, > + "peripheral wakeup", NULL)) { > + pr_err("%s: request_irq() failed\n", > + "peripheral wakeup"); > + } > + } else if (cpu_is_omap16xx()) { > + if (request_irq(INT_1610_WAKE_UP_REQ, omap_wakeup_interrupt, 0, > + "peripheral wakeup", NULL)) { > + pr_err("%s: request_irq() failed\n", > + "peripheral wakeup"); > + } > + } > > /* Program new power ramp-up time > * (0 for most boards since we don't lower voltage when in deep sleep) > diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c > index 524977a31a49..2bd6c4dc6c1f 100644 > --- a/arch/arm/mach-omap1/time.c > +++ b/arch/arm/mach-omap1/time.c > @@ -155,15 +155,11 @@ static irqreturn_t omap_mpu_timer1_interrupt(int irq, void *dev_id) > return IRQ_HANDLED; > } > > -static struct irqaction omap_mpu_timer1_irq = { > - .name = "mpu_timer1", > - .flags = IRQF_TIMER | IRQF_IRQPOLL, > - .handler = omap_mpu_timer1_interrupt, > -}; > - > static __init void omap_init_mpu_timer(unsigned long rate) > { > - setup_irq(INT_TIMER1, &omap_mpu_timer1_irq); > + if (request_irq(INT_TIMER1, omap_mpu_timer1_interrupt, > + IRQF_TIMER | IRQF_IRQPOLL, "mpu_timer1", NULL)) > + pr_err("%s: request_irq() failed\n", "mpu_timer1"); > omap_mpu_timer_start(0, (rate / HZ) - 1, 1); > > clockevent_mpu_timer1.cpumask = cpumask_of(0); > diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c > index 0ae6c52a7d70..1435faca19d8 100644 > --- a/arch/arm/mach-omap1/timer32k.c > +++ b/arch/arm/mach-omap1/timer32k.c > @@ -148,15 +148,11 @@ static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id) > return IRQ_HANDLED; > } > > -static struct irqaction omap_32k_timer_irq = { > - .name = "32KHz timer", > - .flags = IRQF_TIMER | IRQF_IRQPOLL, > - .handler = omap_32k_timer_interrupt, > -}; > - > static __init void omap_init_32k_timer(void) > { > - setup_irq(INT_OS_TIMER, &omap_32k_timer_irq); > + if (request_irq(INT_OS_TIMER, omap_32k_timer_interrupt, > + IRQF_TIMER | IRQF_IRQPOLL, "32KHz timer", NULL)) > + pr_err("%s: request_irq() failed\n", "32KHz timer"); > > clockevent_32k_timer.cpumask = cpumask_of(0); > clockevents_config_and_register(&clockevent_32k_timer, > diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c > index 0d0a731cb476..7cf91f42dbd1 100644 > --- a/arch/arm/mach-omap2/timer.c > +++ b/arch/arm/mach-omap2/timer.c > @@ -91,12 +91,6 @@ static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id) > return IRQ_HANDLED; > } > > -static struct irqaction omap2_gp_timer_irq = { > - .name = "gp_timer", > - .flags = IRQF_TIMER | IRQF_IRQPOLL, > - .handler = omap2_gp_timer_interrupt, > -}; > - > static int omap2_gp_timer_set_next_event(unsigned long cycles, > struct clock_event_device *evt) > { > @@ -382,8 +376,9 @@ static void __init omap2_gp_clockevent_init(int gptimer_id, > &clockevent_gpt.name, OMAP_TIMER_POSTED); > BUG_ON(res); > > - omap2_gp_timer_irq.dev_id = &clkev; > - setup_irq(clkev.irq, &omap2_gp_timer_irq); > + if (request_irq(clkev.irq, omap2_gp_timer_interrupt, > + IRQF_TIMER | IRQF_IRQPOLL, "gp_timer", &clkev)) > + pr_err("%s: request_irq() failed\n", "gp_timer"); > > __omap_dm_timer_int_enable(&clkev, OMAP_TIMER_INT_OVERFLOW); > > diff --git a/arch/arm/mach-rpc/time.c b/arch/arm/mach-rpc/time.c > index 1d750152b160..3b7d3baa8ac1 100644 > --- a/arch/arm/mach-rpc/time.c > +++ b/arch/arm/mach-rpc/time.c > @@ -85,11 +85,6 @@ ioc_timer_interrupt(int irq, void *dev_id) > return IRQ_HANDLED; > } > > -static struct irqaction ioc_timer_irq = { > - .name = "timer", > - .handler = ioc_timer_interrupt > -}; > - > /* > * Set up timer interrupt. > */ > @@ -97,5 +92,6 @@ void __init ioc_timer_init(void) > { > WARN_ON(clocksource_register_hz(&ioctime_clocksource, RPC_CLOCK_FREQ)); > ioctime_init(); > - setup_irq(IRQ_TIMER0, &ioc_timer_irq); > + if (request_irq(IRQ_TIMER0, ioc_timer_interrupt, 0, "timer", NULL)) > + pr_err("%s: request_irq() failed\n", "timer"); > } > diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c > index 289e036c9c30..b69acc04db4a 100644 > --- a/arch/arm/mach-spear/time.c > +++ b/arch/arm/mach-spear/time.c > @@ -181,12 +181,6 @@ static irqreturn_t spear_timer_interrupt(int irq, void *dev_id) > return IRQ_HANDLED; > } > > -static struct irqaction spear_timer_irq = { > - .name = "timer", > - .flags = IRQF_TIMER, > - .handler = spear_timer_interrupt > -}; > - > static void __init spear_clockevent_init(int irq) > { > u32 tick_rate; > @@ -201,7 +195,8 @@ static void __init spear_clockevent_init(int irq) > > clockevents_config_and_register(&clkevt, tick_rate, 3, 0xfff0); > > - setup_irq(irq, &spear_timer_irq); > + if (request_irq(irq, spear_timer_interrupt, IRQF_TIMER, "timer", NULL)) > + pr_err("%s: request_irq() failed\n", "timer"); > } > > static const struct of_device_id timer_of_match[] __initconst = { > diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c > index ffb93db68e9c..0a1faa95ecff 100644 > --- a/arch/arm/plat-orion/time.c > +++ b/arch/arm/plat-orion/time.c > @@ -177,12 +177,6 @@ static irqreturn_t orion_timer_interrupt(int irq, void *dev_id) > return IRQ_HANDLED; > } > > -static struct irqaction orion_timer_irq = { > - .name = "orion_tick", > - .flags = IRQF_TIMER, > - .handler = orion_timer_interrupt > -}; > - > void __init > orion_time_set_base(void __iomem *_timer_base) > { > @@ -236,7 +230,9 @@ orion_time_init(void __iomem *_bridge_base, u32 _bridge_timer1_clr_mask, > /* > * Setup clockevent timer (interrupt-driven). > */ > - setup_irq(irq, &orion_timer_irq); > + if (request_irq(irq, orion_timer_interrupt, IRQF_TIMER, "orion_tick", > + NULL)) > + pr_err("%s: request_irq() failed\n", "orion_tick"); > orion_clkevt.cpumask = cpumask_of(0); > clockevents_config_and_register(&orion_clkevt, tclk, 1, 0xfffffffe); > } > -- > 2.25.1 >
* afzal mohammed <afzal.mohd.ma@gmail.com> [200224 00:49]: > request_irq() is preferred over setup_irq(). The early boot setup_irq() > invocations happen either via 'init_IRQ()' or 'time_init()', while > memory allocators are ready by 'mm_init()'. > > Per tglx[1], setup_irq() existed in olden days when allocators were not > ready by the time early interrupts were initialized. > > Hence replace setup_irq() by request_irq(). > > Seldom remove_irq() usage has been observed coupled with setup_irq(), > wherever that has been found, it too has been replaced by free_irq(). > > [1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos > > Signed-off-by: afzal mohammed <afzal.mohd.ma@gmail.com> > Acked-by: Viresh Kumar <viresh.kumar@linaro.org> > Acked-by: Alexander Sverdlin <alexander.sverdlin@gmail.com> # EP93xx > Tested-by: Alexander Sverdlin <alexander.sverdlin@gmail.com> # EP93xx Works for me: Tested-by: Tony Lindgren <tony@atomide.com> # omap1 osk
diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c index 1d61a7701c11..711d88b64f2e 100644 --- a/arch/arm/mach-cns3xxx/core.c +++ b/arch/arm/mach-cns3xxx/core.c @@ -189,12 +189,6 @@ static irqreturn_t cns3xxx_timer_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static struct irqaction cns3xxx_timer_irq = { - .name = "timer", - .flags = IRQF_TIMER | IRQF_IRQPOLL, - .handler = cns3xxx_timer_interrupt, -}; - /* * Set up the clock source and clock events devices */ @@ -245,7 +239,9 @@ static void __init __cns3xxx_timer_init(unsigned int timer_irq) writel(val, cns3xxx_tmr1 + TIMER1_2_CONTROL_OFFSET); /* Make irqs happen for the system timer */ - setup_irq(timer_irq, &cns3xxx_timer_irq); + if (request_irq(timer_irq, cns3xxx_timer_interrupt, + IRQF_TIMER | IRQF_IRQPOLL, "timer", NULL)) + pr_err("%s: request_irq() failed\n", "timer"); cns3xxx_clockevents_init(timer_irq); } diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c index da2ff4f61d6b..dfe6da30a3e0 100644 --- a/arch/arm/mach-ebsa110/core.c +++ b/arch/arm/mach-ebsa110/core.c @@ -201,12 +201,6 @@ ebsa110_timer_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static struct irqaction ebsa110_timer_irq = { - .name = "EBSA110 Timer Tick", - .flags = IRQF_TIMER | IRQF_IRQPOLL, - .handler = ebsa110_timer_interrupt, -}; - /* * Set up timer interrupt. */ @@ -221,7 +215,9 @@ void __init ebsa110_timer_init(void) __raw_writeb(COUNT & 0xff, PIT_T1); __raw_writeb(COUNT >> 8, PIT_T1); - setup_irq(IRQ_EBSA110_TIMER0, &ebsa110_timer_irq); + if (request_irq(IRQ_EBSA110_TIMER0, ebsa110_timer_interrupt, + IRQF_TIMER | IRQF_IRQPOLL, "EBSA110 Timer Tick", NULL)) + pr_err("%s: request_irq() failed\n", "EBSA110 Timer Tick"); } static struct plat_serial8250_port serial_platform_data[] = { diff --git a/arch/arm/mach-ep93xx/timer-ep93xx.c b/arch/arm/mach-ep93xx/timer-ep93xx.c index de998830f534..01f7e2b0b9fe 100644 --- a/arch/arm/mach-ep93xx/timer-ep93xx.c +++ b/arch/arm/mach-ep93xx/timer-ep93xx.c @@ -117,13 +117,6 @@ static irqreturn_t ep93xx_timer_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static struct irqaction ep93xx_timer_irq = { - .name = "ep93xx timer", - .flags = IRQF_TIMER | IRQF_IRQPOLL, - .handler = ep93xx_timer_interrupt, - .dev_id = &ep93xx_clockevent, -}; - void __init ep93xx_timer_init(void) { /* Enable and register clocksource and sched_clock on timer 4 */ @@ -136,7 +129,10 @@ void __init ep93xx_timer_init(void) EP93XX_TIMER4_RATE); /* Set up clockevent on timer 3 */ - setup_irq(IRQ_EP93XX_TIMER3, &ep93xx_timer_irq); + if (request_irq(IRQ_EP93XX_TIMER3, ep93xx_timer_interrupt, + IRQF_TIMER | IRQF_IRQPOLL, "ep93xx timer", + &ep93xx_clockevent)) + pr_err("%s: request_irq() failed\n", "ep93xx timer"); clockevents_config_and_register(&ep93xx_clockevent, EP93XX_TIMER123_RATE, 1, diff --git a/arch/arm/mach-footbridge/dc21285-timer.c b/arch/arm/mach-footbridge/dc21285-timer.c index f76212d2dbf1..ce70931037c0 100644 --- a/arch/arm/mach-footbridge/dc21285-timer.c +++ b/arch/arm/mach-footbridge/dc21285-timer.c @@ -101,13 +101,6 @@ static irqreturn_t timer1_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static struct irqaction footbridge_timer_irq = { - .name = "dc21285_timer1", - .handler = timer1_interrupt, - .flags = IRQF_TIMER | IRQF_IRQPOLL, - .dev_id = &ckevt_dc21285, -}; - /* * Set up timer interrupt. */ @@ -118,7 +111,9 @@ void __init footbridge_timer_init(void) clocksource_register_hz(&cksrc_dc21285, rate); - setup_irq(ce->irq, &footbridge_timer_irq); + if (request_irq(ce->irq, timer1_interrupt, IRQF_TIMER | IRQF_IRQPOLL, + "dc21285_timer1", &ckevt_dc21285)) + pr_err("%s: request_irq() failed\n", "dc21285_timer1"); ce->cpumask = cpumask_of(smp_processor_id()); clockevents_config_and_register(ce, rate, 0x4, 0xffffff); diff --git a/arch/arm/mach-footbridge/isa-irq.c b/arch/arm/mach-footbridge/isa-irq.c index 88a553932c33..a259d5d8eb20 100644 --- a/arch/arm/mach-footbridge/isa-irq.c +++ b/arch/arm/mach-footbridge/isa-irq.c @@ -96,11 +96,6 @@ static void isa_irq_handler(struct irq_desc *desc) generic_handle_irq(isa_irq); } -static struct irqaction irq_cascade = { - .handler = no_action, - .name = "cascade", -}; - static struct resource pic1_resource = { .name = "pic1", .start = 0x20, @@ -160,7 +155,8 @@ void __init isa_init_irq(unsigned int host_irq) request_resource(&ioport_resource, &pic1_resource); request_resource(&ioport_resource, &pic2_resource); - setup_irq(IRQ_ISA_CASCADE, &irq_cascade); + if (request_irq(IRQ_ISA_CASCADE, no_action, 0, "cascade", NULL)) + pr_err("%s: request_irq() failed\n", "cascade"); irq_set_chained_handler(host_irq, isa_irq_handler); diff --git a/arch/arm/mach-footbridge/isa-timer.c b/arch/arm/mach-footbridge/isa-timer.c index 82f45591fb2c..6c7c6ea03804 100644 --- a/arch/arm/mach-footbridge/isa-timer.c +++ b/arch/arm/mach-footbridge/isa-timer.c @@ -25,17 +25,12 @@ static irqreturn_t pit_timer_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static struct irqaction pit_timer_irq = { - .name = "pit", - .handler = pit_timer_interrupt, - .flags = IRQF_TIMER | IRQF_IRQPOLL, - .dev_id = &i8253_clockevent, -}; - void __init isa_timer_init(void) { clocksource_i8253_init(); - setup_irq(i8253_clockevent.irq, &pit_timer_irq); + if (request_irq(i8253_clockevent.irq, pit_timer_interrupt, + IRQF_TIMER | IRQF_IRQPOLL, "pit", &i8253_clockevent)) + pr_err("%s: request_irq() failed\n", "pit"); clockevent_i8253_init(false); } diff --git a/arch/arm/mach-iop32x/time.c b/arch/arm/mach-iop32x/time.c index 18a4df5c1baa..422e298366bd 100644 --- a/arch/arm/mach-iop32x/time.c +++ b/arch/arm/mach-iop32x/time.c @@ -137,13 +137,6 @@ iop_timer_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static struct irqaction iop_timer_irq = { - .name = "IOP Timer Tick", - .handler = iop_timer_interrupt, - .flags = IRQF_TIMER | IRQF_IRQPOLL, - .dev_id = &iop_clockevent, -}; - static unsigned long iop_tick_rate; unsigned long get_iop_tick_rate(void) { @@ -168,7 +161,10 @@ void __init iop_init_time(unsigned long tick_rate) */ write_tmr0(timer_ctl & ~IOP_TMR_EN); write_tisr(1); - setup_irq(IRQ_IOP32X_TIMER0, &iop_timer_irq); + if (request_irq(IRQ_IOP32X_TIMER0, iop_timer_interrupt, + IRQF_TIMER | IRQF_IRQPOLL, "IOP Timer Tick", + &iop_clockevent)) + pr_err("%s: request_irq() failed\n", "IOP Timer Tick"); iop_clockevent.cpumask = cpumask_of(0); clockevents_config_and_register(&iop_clockevent, tick_rate, 0xf, 0xfffffffe); diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c index c65cfc1ad99b..83af1db45c15 100644 --- a/arch/arm/mach-mmp/time.c +++ b/arch/arm/mach-mmp/time.c @@ -175,13 +175,6 @@ static void __init timer_config(void) __raw_writel(0x2, mmp_timer_base + TMR_CER); } -static struct irqaction timer_irq = { - .name = "timer", - .flags = IRQF_TIMER | IRQF_IRQPOLL, - .handler = timer_interrupt, - .dev_id = &ckevt, -}; - void __init mmp_timer_init(int irq, unsigned long rate) { timer_config(); @@ -190,7 +183,9 @@ void __init mmp_timer_init(int irq, unsigned long rate) ckevt.cpumask = cpumask_of(0); - setup_irq(irq, &timer_irq); + if (request_irq(irq, timer_interrupt, IRQF_TIMER | IRQF_IRQPOLL, + "timer", &ckevt)) + pr_err("%s: request_irq() failed\n", "timer"); clocksource_register_hz(&cksrc, rate); clockevents_config_and_register(&ckevt, rate, MIN_DELTA, MAX_DELTA); diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c index d068958d6f8a..a82e220783d1 100644 --- a/arch/arm/mach-omap1/pm.c +++ b/arch/arm/mach-omap1/pm.c @@ -596,11 +596,6 @@ static irqreturn_t omap_wakeup_interrupt(int irq, void *dev) return IRQ_HANDLED; } -static struct irqaction omap_wakeup_irq = { - .name = "peripheral wakeup", - .handler = omap_wakeup_interrupt -}; - static const struct platform_suspend_ops omap_pm_ops = { @@ -655,10 +650,19 @@ static int __init omap_pm_init(void) arm_pm_idle = omap1_pm_idle; - if (cpu_is_omap7xx()) - setup_irq(INT_7XX_WAKE_UP_REQ, &omap_wakeup_irq); - else if (cpu_is_omap16xx()) - setup_irq(INT_1610_WAKE_UP_REQ, &omap_wakeup_irq); + if (cpu_is_omap7xx()) { + if (request_irq(INT_7XX_WAKE_UP_REQ, omap_wakeup_interrupt, 0, + "peripheral wakeup", NULL)) { + pr_err("%s: request_irq() failed\n", + "peripheral wakeup"); + } + } else if (cpu_is_omap16xx()) { + if (request_irq(INT_1610_WAKE_UP_REQ, omap_wakeup_interrupt, 0, + "peripheral wakeup", NULL)) { + pr_err("%s: request_irq() failed\n", + "peripheral wakeup"); + } + } /* Program new power ramp-up time * (0 for most boards since we don't lower voltage when in deep sleep) diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c index 524977a31a49..2bd6c4dc6c1f 100644 --- a/arch/arm/mach-omap1/time.c +++ b/arch/arm/mach-omap1/time.c @@ -155,15 +155,11 @@ static irqreturn_t omap_mpu_timer1_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static struct irqaction omap_mpu_timer1_irq = { - .name = "mpu_timer1", - .flags = IRQF_TIMER | IRQF_IRQPOLL, - .handler = omap_mpu_timer1_interrupt, -}; - static __init void omap_init_mpu_timer(unsigned long rate) { - setup_irq(INT_TIMER1, &omap_mpu_timer1_irq); + if (request_irq(INT_TIMER1, omap_mpu_timer1_interrupt, + IRQF_TIMER | IRQF_IRQPOLL, "mpu_timer1", NULL)) + pr_err("%s: request_irq() failed\n", "mpu_timer1"); omap_mpu_timer_start(0, (rate / HZ) - 1, 1); clockevent_mpu_timer1.cpumask = cpumask_of(0); diff --git a/arch/arm/mach-omap1/timer32k.c b/arch/arm/mach-omap1/timer32k.c index 0ae6c52a7d70..1435faca19d8 100644 --- a/arch/arm/mach-omap1/timer32k.c +++ b/arch/arm/mach-omap1/timer32k.c @@ -148,15 +148,11 @@ static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static struct irqaction omap_32k_timer_irq = { - .name = "32KHz timer", - .flags = IRQF_TIMER | IRQF_IRQPOLL, - .handler = omap_32k_timer_interrupt, -}; - static __init void omap_init_32k_timer(void) { - setup_irq(INT_OS_TIMER, &omap_32k_timer_irq); + if (request_irq(INT_OS_TIMER, omap_32k_timer_interrupt, + IRQF_TIMER | IRQF_IRQPOLL, "32KHz timer", NULL)) + pr_err("%s: request_irq() failed\n", "32KHz timer"); clockevent_32k_timer.cpumask = cpumask_of(0); clockevents_config_and_register(&clockevent_32k_timer, diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 0d0a731cb476..7cf91f42dbd1 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -91,12 +91,6 @@ static irqreturn_t omap2_gp_timer_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static struct irqaction omap2_gp_timer_irq = { - .name = "gp_timer", - .flags = IRQF_TIMER | IRQF_IRQPOLL, - .handler = omap2_gp_timer_interrupt, -}; - static int omap2_gp_timer_set_next_event(unsigned long cycles, struct clock_event_device *evt) { @@ -382,8 +376,9 @@ static void __init omap2_gp_clockevent_init(int gptimer_id, &clockevent_gpt.name, OMAP_TIMER_POSTED); BUG_ON(res); - omap2_gp_timer_irq.dev_id = &clkev; - setup_irq(clkev.irq, &omap2_gp_timer_irq); + if (request_irq(clkev.irq, omap2_gp_timer_interrupt, + IRQF_TIMER | IRQF_IRQPOLL, "gp_timer", &clkev)) + pr_err("%s: request_irq() failed\n", "gp_timer"); __omap_dm_timer_int_enable(&clkev, OMAP_TIMER_INT_OVERFLOW); diff --git a/arch/arm/mach-rpc/time.c b/arch/arm/mach-rpc/time.c index 1d750152b160..3b7d3baa8ac1 100644 --- a/arch/arm/mach-rpc/time.c +++ b/arch/arm/mach-rpc/time.c @@ -85,11 +85,6 @@ ioc_timer_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static struct irqaction ioc_timer_irq = { - .name = "timer", - .handler = ioc_timer_interrupt -}; - /* * Set up timer interrupt. */ @@ -97,5 +92,6 @@ void __init ioc_timer_init(void) { WARN_ON(clocksource_register_hz(&ioctime_clocksource, RPC_CLOCK_FREQ)); ioctime_init(); - setup_irq(IRQ_TIMER0, &ioc_timer_irq); + if (request_irq(IRQ_TIMER0, ioc_timer_interrupt, 0, "timer", NULL)) + pr_err("%s: request_irq() failed\n", "timer"); } diff --git a/arch/arm/mach-spear/time.c b/arch/arm/mach-spear/time.c index 289e036c9c30..b69acc04db4a 100644 --- a/arch/arm/mach-spear/time.c +++ b/arch/arm/mach-spear/time.c @@ -181,12 +181,6 @@ static irqreturn_t spear_timer_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static struct irqaction spear_timer_irq = { - .name = "timer", - .flags = IRQF_TIMER, - .handler = spear_timer_interrupt -}; - static void __init spear_clockevent_init(int irq) { u32 tick_rate; @@ -201,7 +195,8 @@ static void __init spear_clockevent_init(int irq) clockevents_config_and_register(&clkevt, tick_rate, 3, 0xfff0); - setup_irq(irq, &spear_timer_irq); + if (request_irq(irq, spear_timer_interrupt, IRQF_TIMER, "timer", NULL)) + pr_err("%s: request_irq() failed\n", "timer"); } static const struct of_device_id timer_of_match[] __initconst = { diff --git a/arch/arm/plat-orion/time.c b/arch/arm/plat-orion/time.c index ffb93db68e9c..0a1faa95ecff 100644 --- a/arch/arm/plat-orion/time.c +++ b/arch/arm/plat-orion/time.c @@ -177,12 +177,6 @@ static irqreturn_t orion_timer_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } -static struct irqaction orion_timer_irq = { - .name = "orion_tick", - .flags = IRQF_TIMER, - .handler = orion_timer_interrupt -}; - void __init orion_time_set_base(void __iomem *_timer_base) { @@ -236,7 +230,9 @@ orion_time_init(void __iomem *_bridge_base, u32 _bridge_timer1_clr_mask, /* * Setup clockevent timer (interrupt-driven). */ - setup_irq(irq, &orion_timer_irq); + if (request_irq(irq, orion_timer_interrupt, IRQF_TIMER, "orion_tick", + NULL)) + pr_err("%s: request_irq() failed\n", "orion_tick"); orion_clkevt.cpumask = cpumask_of(0); clockevents_config_and_register(&orion_clkevt, tclk, 1, 0xfffffffe); }