Skip to contentSkip to conversation

ARM: OMAP: replace setup_irq() by request_irq()

PATCH Applied afzal mohammed 8 participants 30 messages Mar 1, 2020 – Mar 27, 2020

Subsystems (9)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 ARM: OMAP: replace setup_irq() by request_irq()

request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.

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().

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos

---
Hi sub-arch maintainers,

If the patch is okay, please take it thr' your tree.

Regards
afzal

v3:
* Split out from series, also create subarch level patch as Thomas suggested to take it thr' respective maintainers
* Modify string displayed in case of error as suggested by Thomas
* Re-arrange code as required to improve readability
* Remove irrelevant parts from commit message & improve

v2:
* Replace pr_err("request_irq() on %s failed" by

           pr_err("%s: request_irq() failed"

* Commit message massage

 arch/arm/mach-omap1/pm.c       | 13 ++++++-------
 arch/arm/mach-omap1/time.c     | 10 +++-------
 arch/arm/mach-omap1/timer32k.c | 10 +++-------
 arch/arm/mach-omap2/timer.c    | 11 +++--------
 4 files changed, 15 insertions(+), 29 deletions(-)
arch/arm/mach-omap1/pm.c +6 -7
index d068958d6f8a..2c1e2b32b9b3 100644
@@ -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 = {
@@ -613,6 +608,7 @@ static const struct platform_suspend_ops omap_pm_ops = {
 static int __init omap_pm_init(void)
 {
 	int error = 0;
+	int irq;
 
 	if (!cpu_class_is_omap1())
 		return -ENODEV;
@@ -656,9 +652,12 @@ 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);
+		irq = INT_7XX_WAKE_UP_REQ;
 	else if (cpu_is_omap16xx())
-		setup_irq(INT_1610_WAKE_UP_REQ, &omap_wakeup_irq);
+		irq = INT_1610_WAKE_UP_REQ;
+	if (request_irq(irq, omap_wakeup_interrupt, 0, "peripheral wakeup",
+			NULL))
+		pr_err("Failed to request irq %d (peripheral wakeup)\n", irq);
 
 	/* Program new power ramp-up time
 	 * (0 for most boards since we don't lower voltage when in deep sleep)
arch/arm/mach-omap1/time.c +3 -7
index 524977a31a49..de590a85a42b 100644
@@ -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("Failed to request irq %d (mpu_timer1)\n", INT_TIMER1);
 	omap_mpu_timer_start(0, (rate / HZ) - 1, 1);
 
 	clockevent_mpu_timer1.cpumask = cpumask_of(0);
arch/arm/mach-omap1/timer32k.c +3 -7
index 0ae6c52a7d70..780fdf03c3ce 100644
@@ -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("Failed to request irq %d(32KHz timer)\n", INT_OS_TIMER);
 
 	clockevent_32k_timer.cpumask = cpumask_of(0);
 	clockevents_config_and_register(&clockevent_32k_timer,
arch/arm/mach-omap2/timer.c +3 -8
index 0d0a731cb476..8b09cdacc30d 100644
@@ -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("Failed to request irq %d (gp_timer)\n", clkev.irq);
 
 	__omap_dm_timer_int_enable(&clkev, OMAP_TIMER_INT_OVERFLOW);
 
Signature · 1 line
2.25.1
maintainer Applied
#1 lore raw
Quoted 8 lines · afzal mohammed

request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.

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().

Quoted 7 lines

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos

---
Hi sub-arch maintainers,

If the patch is okay, please take it thr' your tree.

Thanks applied into omap-for-v5.7/omap1.

Regards,

Tony

#2 lore raw

PATCH v3 1/1 ARM: ep93xx: Replace setup_irq() by request_irq()

request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.

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().

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos

---
Hi sub-arch maintainers,

If the patch is okay, please take it thr' your tree.

Regards
afzal

v3:
* Split out from series, also create subarch level patch as Thomas suggested to take it thr' respective maintainers
* Modify string displayed in case of error as suggested by Thomas
* Re-arrange code as required to improve readability
* Remove irrelevant parts from commit message & improve

v2:
* Replace pr_err("request_irq() on %s failed" by

           pr_err("%s: request_irq() failed"

* Commit message massage

 arch/arm/mach-ep93xx/timer-ep93xx.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
arch/arm/mach-ep93xx/timer-ep93xx.c +6 -8
index de998830f534..dd4b164d1831 100644
@@ -117,15 +117,11 @@ 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)
 {
+	int irq = IRQ_EP93XX_TIMER3;
+	unsigned long flags = IRQF_TIMER | IRQF_IRQPOLL;
+
 	/* Enable and register clocksource and sched_clock on timer 4 */
 	writel(EP93XX_TIMER4_VALUE_HIGH_ENABLE,
 	       EP93XX_TIMER4_VALUE_HIGH);
@@ -136,7 +132,9 @@ 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_timer_interrupt, flags, "ep93xx timer",
+			&ep93xx_clockevent))
+		pr_err("Failed to request irq %d (ep93xx timer)\n", irq);
 	clockevents_config_and_register(&ep93xx_clockevent,
 					EP93XX_TIMER123_RATE,
 					1,
Signature · 1 line
2.25.1
maintainer Acked-by on v3 1/1
#3 lore raw

Re: [PATCH v3] ARM: ep93xx: Replace setup_irq() by request_irq()

Hi Afzal, Arnd,

as there is no dedicated tree for EP93xx, could you please consider the below patch for your arm-soc tree?

Quoted 11 lines · afzal mohammed

request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.

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().

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos

Quoted 58 lines

---
Hi sub-arch maintainers,

If the patch is okay, please take it thr' your tree.

Regards
afzal

v3:
* Split out from series, also create subarch level patch as Thomas suggested to take it thr' respective maintainers
* Modify string displayed in case of error as suggested by Thomas
* Re-arrange code as required to improve readability
* Remove irrelevant parts from commit message & improve

v2:
* Replace pr_err("request_irq() on %s failed" by

           pr_err("%s: request_irq() failed"

* Commit message massage

 arch/arm/mach-ep93xx/timer-ep93xx.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
arch/arm/mach-ep93xx/timer-ep93xx.c +6 -8
index de998830f534..dd4b164d1831 100644
@@ -117,15 +117,11 @@ 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)
 {
+	int irq = IRQ_EP93XX_TIMER3;
+	unsigned long flags = IRQF_TIMER | IRQF_IRQPOLL;
+
 	/* Enable and register clocksource and sched_clock on timer 4 */
 	writel(EP93XX_TIMER4_VALUE_HIGH_ENABLE,
 	       EP93XX_TIMER4_VALUE_HIGH);
@@ -136,7 +132,9 @@ 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_timer_interrupt, flags, "ep93xx timer",
+			&ep93xx_clockevent))
+		pr_err("Failed to request irq %d (ep93xx timer)\n", irq);
 	clockevents_config_and_register(&ep93xx_clockevent,
 					EP93XX_TIMER123_RATE,
 					1,
#4 lore raw

PATCH v3 1/1 ARM: iop32x: replace setup_irq() by request_irq()

request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.

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().

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos

---
Hi sub-arch maintainers,

If the patch is okay, please take it thr' your tree.

Regards
afzal

v3:
* Split out from series, also split out from ARM patch to subarch level as Thomas suggested to take it thr' respective maintainers
* Modify string displayed in case of error as suggested by Thomas
* Re-arrange code as required to improve readability
* Remove irrelevant parts from commit message & improve

v2:
* Replace pr_err("request_irq() on %s failed" by

           pr_err("%s: request_irq() failed"

* Commit message massage

 arch/arm/mach-iop32x/time.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
arch/arm/mach-iop32x/time.c +4 -8
index 18a4df5c1baa..ae533b66fefd 100644
@@ -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)
 {
@@ -154,6 +147,7 @@ EXPORT_SYMBOL(get_iop_tick_rate);
 void __init iop_init_time(unsigned long tick_rate)
 {
 	u32 timer_ctl;
+	int irq = IRQ_IOP32X_TIMER0;
 
 	sched_clock_register(iop_read_sched_clock, 32, tick_rate);
 
@@ -168,7 +162,9 @@ 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, iop_timer_interrupt, IRQF_TIMER | IRQF_IRQPOLL,
+			"IOP Timer Tick", &iop_clockevent))
+		pr_err("Failed to request irq() %d (IOP Timer Tick)\n", irq);
 	iop_clockevent.cpumask = cpumask_of(0);
 	clockevents_config_and_register(&iop_clockevent, tick_rate,
 					0xf, 0xfffffffe);
Signature · 1 line
2.25.1
#5 lore raw

PATCH v3 1/1 ARM: mmp: replace setup_irq() by request_irq()

request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.

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().

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos

---
Hi sub-arch maintainers,

If the patch is okay, please take it thr' your tree.

Regards
afzal

v3:
* Split out from series, also split out from ARM patch to subarch level as Thomas suggested to take it thr' respective maintainers
* Modify string displayed in case of error as suggested by Thomas
* Re-arrange code as required to improve readability
* Remove irrelevant parts from commit message & improve

v2:
* Replace pr_err("request_irq() on %s failed" by

           pr_err("%s: request_irq() failed"

* Commit message massage

 arch/arm/mach-mmp/time.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
arch/arm/mach-mmp/time.c +3 -8
index c65cfc1ad99b..049a65f47b42 100644
@@ -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("Failed to request irq %d (timer)\n", irq);
 
 	clocksource_register_hz(&cksrc, rate);
 	clockevents_config_and_register(&ckevt, rate, MIN_DELTA, MAX_DELTA);
Signature · 1 line
2.25.1
#6 lore raw

Re: [PATCH v3] ARM: mmp: replace setup_irq() by request_irq()

Hi Lubomir,

Quoted 3 lines · afzal mohammed

Hi sub-arch maintainers,

If the patch is okay, please take it thr' your tree.

get_maintainers doesn't show any maintainers for mmp, but it specifies you as the sole reviewer, please let me know the route upstream for this patch.

Regards
afzal

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

reviewer Acked-by Tested-by
#7 lore raw

Re: [PATCH v3] ARM: mmp: replace setup_irq() by request_irq()

Quoted 11 lines · afzal mohammed

Hi Lubomir,

Quoted 3 lines · afzal mohammed

Hi sub-arch maintainers,

If the patch is okay, please take it thr' your tree.

get_maintainers doesn't show any maintainers for mmp, but it specifies you as the sole reviewer, please let me know the route upstream for this patch.

Olof,

I'm wondering if you could include this in arm-soc?

The patch is here, if you don't have the rest of the thread:
https://lore.kernel.org/lkml/[email protected]/

It has been

(afzal; I believe I've responded with the Tested-by before; please don't forget collect those when resubmitting patches in future. Thanks!)

Thank you,
Lubo

Quoted 3 lines

Regards
afzal

#8 lore raw

Re: [PATCH v3] ARM: mmp: replace setup_irq() by request_irq()

Hi Lubo,

Quoted 3 lines · Lubomir Rintel

It has been

Thanks

Quoted 2 lines

(afzal; I believe I've responded with the Tested-by before; please don't forget collect those when resubmitting patches in future. Thanks!)

The reason was a few minor changes in v3 vs v2, as that was the case i was unsure whether to keep it or not, so went conservative & removed it.

Regards
afzal

#9 lore raw

PATCH v3 1/1 ARM: spear: replace setup_irq() by request_irq()

request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.

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().

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos

---
Hi sub-arch maintainers,

If the patch is okay, please take it thr' your tree.

Regards
afzal

v3:
* Split out from series, also split out from ARM patch to subarch level as Thomas suggested to take it thr' respective maintainers
* Modify string displayed in case of error as suggested by Thomas
* Re-arrange code as required to improve readability
* Remove irrelevant parts from commit message & improve

v2:
* Replace pr_err("request_irq() on %s failed" by

           pr_err("%s: request_irq() failed"

* Commit message massage

 arch/arm/mach-spear/time.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
arch/arm/mach-spear/time.c +2 -7
index 289e036c9c30..d1fdb6066f7b 100644
@@ -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("Failed to request irq %d (timer)\n", irq);
 }
 
 static const struct of_device_id timer_of_match[] __initconst = {
Signature · 1 line
2.25.1
Acked-by on v3 1/1
#10 lore raw

Re: [PATCH v3] ARM: spear: replace setup_irq() by request_irq()

Quoted 11 lines · afzal mohammed

request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.

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().

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos

I think I had already Acked it earlier.

Please get this through Arnd directly.

Signature · 6 lines
viresh

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
#11 lore raw

PATCH v3 1/1 ARM: orion: replace setup_irq() by request_irq()

request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.

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().

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos

---
Hi sub-arch maintainers,

If the patch is okay, please take it thr' your tree.

Regards
afzal

v3:
* Split out from series, also split out from ARM patch to subarch level as Thomas suggested to take it thr' respective maintainers
* Modify string displayed in case of error as suggested by Thomas
* Re-arrange code as required to improve readability
* Remove irrelevant parts from commit message & improve

v2:
* Replace pr_err("request_irq() on %s failed" by

           pr_err("%s: request_irq() failed"

* Commit message massage

 arch/arm/plat-orion/time.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
arch/arm/plat-orion/time.c +3 -7
index ffb93db68e9c..509d4824dc1c 100644
@@ -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("Failed to request irq %u (orion_tick)\n", irq);
 	orion_clkevt.cpumask = cpumask_of(0);
 	clockevents_config_and_register(&orion_clkevt, tclk, 1, 0xfffffffe);
 }
Signature · 1 line
2.25.1
maintainer Reviewed-by on v3 1/1
#12 lore raw

Re: [PATCH v3] ARM: orion: replace setup_irq() by request_irq()

Quoted 11 lines · afzal mohammed

request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.

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().

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos

Andrew

maintainer
#14 lore raw

Re: [PATCH v3] ARM: orion: replace setup_irq() by request_irq()

Hello afzal mohammed,

Quoted 3 lines

Hi Andrew, Jason, Sebastian, Gregory,

Please let me know the way upstream for this patch

I am taking care of it.

Gregory

Quoted 9 lines · Andrew Lunn
Quoted 2 lines

Thanks Andrew

Regards
afzal

Signature · 3 lines
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com
#15 lore raw

Re: [PATCH v3] ARM: replace setup_irq() by request_irq()

Hi Olof, Arnd,

This is regarding cleanup of setup_irq() usages & replacing it w/ request_irq(). Earlier it was sent as single series spanning all architectures & drivers, later Thomas Gleixner suggested [1] to take it thr' relevant maintainers. As for ARM, there is an additional layer of sub-architecture maintainers, for ARM, patches were sent to relevant subsystem maintainers & mailing list, all copied to LAKML as well.

There were 10 sub-arch's in ARM that were subjected to the cleanup,

1. OMAP :https://lkml.kernel.org/r/[email protected]
2. ebsa110 :https://lkml.kernel.org/r/[email protected]
3. rpc :https://lkml.kernel.org/r/[email protected]
4. footbridge :https://lkml.kernel.org/r/[email protected]
5. orion :https://lkml.kernel.org/r/[email protected]
6. ep93xx :https://lkml.kernel.org/r/[email protected]
7. spear :https://lkml.kernel.org/r/[email protected]
8. cns3xxx :https://lkml.kernel.org/r/[email protected]
9. mmp :https://lkml.kernel.org/r/[email protected]
10. iop32x :https://lkml.kernel.org/r/[email protected]

Of this,

(1) OMAP, (2) ebsa110 & (3) rpc are already in linux-next.

(4) footbridge (Russell) - there was a build warning, so he dropped after applying to his tree, i have submitted the newer fixed version in his patch system.

(5) orion - Andrew has given Reviewed-by & Gregory mentioned that he will take care of it.

So if things goes as expected 1 & 5 will be coming to you thr' sub-arch maintainers, while 2-4 directly via Russell

Now we are left with five (6-10),
(6) ep93xx - Alexander has given Acked-by & mentioned to take thr' Arnd
(7) spear - Viresh has given Acked-by & mentioned to take it thr' Arnd
(8) cns3xxx - Krzysztof has given Acked-by (though not copied to lists, he has been cc'ed here)
(9) mmp - Lubomir has given Acked-by & Tested-by & mentioned to get it thr' Olof
(10) iop32xx - per get_mantainer, an orphan

Can you please include the patches 6-10 directly into the armsoc tree ?, Let me know if anything needs to be done from my side.

Regards
afzal

[1] https://lkml.kernel.org/r/[email protected]

#16 lore raw

Re: [PATCH v3] ARM: replace setup_irq() by request_irq()

+ [email protected], [email protected],

in case it helps to reduce the chances of below mail getting slipped thr' the cracks.

Regards
afzal

Quoted 52 lines · afzal mohammed

Hi Olof, Arnd,

This is regarding cleanup of setup_irq() usages & replacing it w/ request_irq(). Earlier it was sent as single series spanning all architectures & drivers, later Thomas Gleixner suggested [1] to take it thr' relevant maintainers. As for ARM, there is an additional layer of sub-architecture maintainers, for ARM, patches were sent to relevant subsystem maintainers & mailing list, all copied to LAKML as well.

There were 10 sub-arch's in ARM that were subjected to the cleanup,

1. OMAP :https://lkml.kernel.org/r/[email protected]
2. ebsa110 :https://lkml.kernel.org/r/[email protected]
3. rpc :https://lkml.kernel.org/r/[email protected]
4. footbridge :https://lkml.kernel.org/r/[email protected]
5. orion :https://lkml.kernel.org/r/[email protected]
6. ep93xx :https://lkml.kernel.org/r/[email protected]
7. spear :https://lkml.kernel.org/r/[email protected]
8. cns3xxx :https://lkml.kernel.org/r/[email protected]
9. mmp :https://lkml.kernel.org/r/[email protected]
10. iop32x :https://lkml.kernel.org/r/[email protected]

Of this,

(1) OMAP, (2) ebsa110 & (3) rpc are already in linux-next.

(4) footbridge (Russell) - there was a build warning, so he dropped after applying to his tree, i have submitted the newer fixed version in his patch system.

(5) orion - Andrew has given Reviewed-by & Gregory mentioned that he will take care of it.

So if things goes as expected 1 & 5 will be coming to you thr' sub-arch maintainers, while 2-4 directly via Russell

Now we are left with five (6-10),
(6) ep93xx - Alexander has given Acked-by & mentioned to take thr' Arnd
(7) spear - Viresh has given Acked-by & mentioned to take it thr' Arnd
(8) cns3xxx - Krzysztof has given Acked-by (though not copied to lists, he has been cc'ed here)
(9) mmp - Lubomir has given Acked-by & Tested-by & mentioned to get it thr' Olof
(10) iop32xx - per get_mantainer, an orphan

Can you please include the patches 6-10 directly into the armsoc tree ?, Let me know if anything needs to be done from my side.

Regards
afzal

[1] https://lkml.kernel.org/r/[email protected]

#17 lore raw

Re: [PATCH v3] ARM: replace setup_irq() by request_irq()

Hi arm-soc maintainers,

Quoted 4 lines · afzal mohammed

+ [email protected], [email protected],
in case it helps to reduce the chances of below mail getting slipped thr' the cracks.

Quoted 10 lines
Quoted 8 lines · afzal mohammed

Hi Olof, Arnd,

This is regarding cleanup of setup_irq() usages & replacing it w/ request_irq(). Earlier it was sent as single series spanning all architectures & drivers, later Thomas Gleixner suggested [1] to take it thr' relevant maintainers. As for ARM, there is an additional layer of sub-architecture maintainers, for ARM, patches were sent to relevant subsystem maintainers & mailing list, all copied to LAKML as well.

:
:

Quoted 9 lines
Quoted 9 lines

Of this,
(1) OMAP, (2) ebsa110 & (3) rpc are already in linux-next.
(4) footbridge (Russell) - there was a build warning, so he dropped after applying to his tree, i have submitted the newer fixed version in his patch system.
(5) orion - Andrew has given Reviewed-by & Gregory mentioned that he will take care of it.
So if things goes as expected 1 & 5 will be coming to you thr' sub-arch maintainers, while 2-4 directly via Russell

footbridge & orion went into -next around a week back

Quoted 11 lines
Quoted 11 lines

Now we are left with five (6-10),
(6) ep93xx - Alexander has given Acked-by & mentioned to take thr' Arnd
(7) spear - Viresh has given Acked-by & mentioned to take it thr' Arnd
(8) cns3xxx - Krzysztof has given Acked-by (though not copied to lists, he has been cc'ed here)
(9) mmp - Lubomir has given Acked-by & Tested-by & mentioned to get it thr' Olof
(10) iop32xx - per get_mantainer, an orphan

Can you please include the patches 6-10 directly into the armsoc tree ?, Let me know if anything needs to be done from my side.

Can you please consider for inclusion the above 5 patches.

Sorry for pestering, i understand that none of the ARM SoC pull requests has been picked up as opposed to what happens normally by this time of development cycle. Still asking as this is part of tree wide series & it is safe to send core removal patch of setup_irq() to Thomas only after all it's usages have been removed.

REgards
afzal

Quoted 1 line
Quoted 1 line

[1] https://lkml.kernel.org/r/[email protected]

#18 lore raw

Re: [PATCH v3] ARM: replace setup_irq() by request_irq()

Hi Arnd,

Quoted 11 lines · afzal mohammed
Quoted 4 lines · afzal mohammed
Quoted 2 lines · afzal mohammed

Can you please include the patches 6-10 directly into the armsoc tree ?, Let me know if anything needs to be done from my side.

Can you please consider for inclusion the above 5 patches.

Sorry for pestering, i understand that none of the ARM SoC pull requests has been picked up as opposed to what happens normally by this time of development cycle.

i think you have pulled the ARM SoC pull requests, but above changes doesn't seem to be applied, can you please respond on how to proceed ? (of all the tree-wide changes, the above are the only ones in limbo)

Regards
afzal

#19 lore raw

Re: [PATCH v3] ARM: replace setup_irq() by request_irq()

Quoted 12 lines · afzal mohammed

Hi Arnd,

Quoted 8 lines · afzal mohammed
Quoted 4 lines · afzal mohammed
Quoted 2 lines · afzal mohammed

Can you please include the patches 6-10 directly into the armsoc tree ?, Let me know if anything needs to be done from my side.

Can you please consider for inclusion the above 5 patches.

Quoted 7 lines
Quoted 3 lines

Sorry for pestering, i understand that none of the ARM SoC pull requests has been picked up as opposed to what happens normally by this time of development cycle.

i think you have pulled the ARM SoC pull requests, but above changes doesn't seem to be applied, can you please respond on how to proceed ? (of all the tree-wide changes, the above are the only ones in limbo)

Hi afzal,

To make sure I get the right ones, could you bounce all the patches that are still missing to [email protected] to let them show up in patchwork?

I'll apply them right away after that. Sorry I forgot about them as I went through the patchwork backlog.

Arnd

#20 lore raw

Re: [PATCH v3] ARM: replace setup_irq() by request_irq()

Hi Arnd,

Quoted 2 lines · Arnd Bergmann

To make sure I get the right ones, could you bounce all the patches that are still missing to [email protected] to let them show up in patchwork?

Done.

If it helps, i can send the same patches w/ tags received as well.

Regards
afzal

#21 lore raw

Re: [PATCH v3] ARM: replace setup_irq() by request_irq()

Hi Arnd,

Quoted 6 lines · afzal mohammed
Quoted 2 lines · Arnd Bergmann

To make sure I get the right ones, could you bounce all the patches that are still missing to [email protected] to let them show up in patchwork?

Done.

Sorry, i first forwarded, after that i bounced all, but not able to see the bounced ones in patchwork, only the forwarded ones.

Quoted 1 line

If it helps, i can send the same patches w/ tags received as well.

Let me know if if anything more needs to be done from my side.

Regards
afzal

#22 lore raw

Re: [PATCH v3] ARM: replace setup_irq() by request_irq()

Quoted 6 lines · afzal mohammed

Hi Arnd,

Quoted 1 line · afzal mohammed

On Fri, Mar 27, 2020 at 11:55:36AM +0100, Arnd Bergmann wrote:

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

To make sure I get the right ones, could you bounce all the patches that are still missing to [email protected] to let them show up in patchwork?

Done.

Sorry, i first forwarded, after that i bounced all, but not able to see the bounced ones in patchwork, only the forwarded ones.

Right, I see the same thing. Unfortunately, the version I have now doesn't work easily in git-am.

Quoted 3 lines
Quoted 1 line

If it helps, i can send the same patches w/ tags received as well.

Let me know if if anything more needs to be done from my side.

I can probably fix it up here, but it would help if you can resend the remaining patches using git-send-email with all the tags added in and the normal subject lines.

Arnd

#23 lore raw

PATCH v4 1/5 ARM: ep93xx: Replace setup_irq() by request_irq()

request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.

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().

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos

---

v4:
* Add received tags

v3:
* Split out from series, also create subarch level patch as Thomas suggested to take it thr' respective maintainers
* Modify string displayed in case of error as suggested by Thomas
* Re-arrange code as required to improve readability
* Remove irrelevant parts from commit message & improve

v2:
* Replace pr_err("request_irq() on %s failed" by

           pr_err("%s: request_irq() failed"

* Commit message massage

 arch/arm/mach-ep93xx/timer-ep93xx.c | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)
arch/arm/mach-ep93xx/timer-ep93xx.c +6 -8
index de998830f534..dd4b164d1831 100644
@@ -117,15 +117,11 @@ 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)
 {
+	int irq = IRQ_EP93XX_TIMER3;
+	unsigned long flags = IRQF_TIMER | IRQF_IRQPOLL;
+
 	/* Enable and register clocksource and sched_clock on timer 4 */
 	writel(EP93XX_TIMER4_VALUE_HIGH_ENABLE,
 	       EP93XX_TIMER4_VALUE_HIGH);
@@ -136,7 +132,9 @@ 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_timer_interrupt, flags, "ep93xx timer",
+			&ep93xx_clockevent))
+		pr_err("Failed to request irq %d (ep93xx timer)\n", irq);
 	clockevents_config_and_register(&ep93xx_clockevent,
 					EP93XX_TIMER123_RATE,
 					1,
Signature · 1 line
2.25.1
#24 lore raw

PATCH v4 2/5 ARM: spear: replace setup_irq() by request_irq()

In reply to Arnd Bergmann

request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.

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().

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos

---

v4:
* Add received tags

v3:
* Split out from series, also split out from ARM patch to subarch level as Thomas suggested to take it thr' respective maintainers
* Modify string displayed in case of error as suggested by Thomas
* Re-arrange code as required to improve readability
* Remove irrelevant parts from commit message & improve

v2:
* Replace pr_err("request_irq() on %s failed" by

           pr_err("%s: request_irq() failed"

* Commit message massage

 arch/arm/mach-spear/time.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
arch/arm/mach-spear/time.c +2 -7
index 289e036c9c30..d1fdb6066f7b 100644
@@ -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("Failed to request irq %d (timer)\n", irq);
 }
 
 static const struct of_device_id timer_of_match[] __initconst = {
Signature · 1 line
2.25.1
#25 lore raw

PATCH v4 3/5 ARM: cns3xxx: replace setup_irq() by request_irq()

In reply to Arnd Bergmann

request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.

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().

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos

---

v4:
* Add received tags

v3:
* Split out from series, also split out from ARM patch to subarch level as Thomas suggested to take it thr' respective maintainers
* Modify string displayed in case of error as suggested by Thomas
* Re-arrange code as required to improve readability
* Remove irrelevant parts from commit message & improve

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 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
arch/arm/mach-cns3xxx/core.c +3 -7
index 1d61a7701c11..e4f4b20b83a2 100644
@@ -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("Failed to request irq %d (timer)\n", timer_irq);
 
 	cns3xxx_clockevents_init(timer_irq);
 }
Signature · 1 line
2.25.1
#26 lore raw

PATCH v4 4/5 ARM: mmp: replace setup_irq() by request_irq()

In reply to Arnd Bergmann

request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.

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().

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos

---

v4:
* Add received tags

v3:
* Split out from series, also split out from ARM patch to subarch level as Thomas suggested to take it thr' respective maintainers
* Modify string displayed in case of error as suggested by Thomas
* Re-arrange code as required to improve readability
* Remove irrelevant parts from commit message & improve

v2:
* Replace pr_err("request_irq() on %s failed" by

           pr_err("%s: request_irq() failed"

* Commit message massage

 arch/arm/mach-mmp/time.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
arch/arm/mach-mmp/time.c +3 -8
index c65cfc1ad99b..049a65f47b42 100644
@@ -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("Failed to request irq %d (timer)\n", irq);
 
 	clocksource_register_hz(&cksrc, rate);
 	clockevents_config_and_register(&ckevt, rate, MIN_DELTA, MAX_DELTA);
Signature · 1 line
2.25.1
#27 lore raw

PATCH v4 5/5 ARM: iop32x: replace setup_irq() by request_irq()

In reply to Arnd Bergmann

request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.

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().

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos

---

v4:
* No change

v3:
* Split out from series, also split out from ARM patch to subarch level as Thomas suggested to take it thr' respective maintainers
* Modify string displayed in case of error as suggested by Thomas
* Re-arrange code as required to improve readability
* Remove irrelevant parts from commit message & improve

v2:
* Replace pr_err("request_irq() on %s failed" by

           pr_err("%s: request_irq() failed"

* Commit message massage

 arch/arm/mach-iop32x/time.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
arch/arm/mach-iop32x/time.c +4 -8
index 18a4df5c1baa..ae533b66fefd 100644
@@ -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)
 {
@@ -154,6 +147,7 @@ EXPORT_SYMBOL(get_iop_tick_rate);
 void __init iop_init_time(unsigned long tick_rate)
 {
 	u32 timer_ctl;
+	int irq = IRQ_IOP32X_TIMER0;
 
 	sched_clock_register(iop_read_sched_clock, 32, tick_rate);
 
@@ -168,7 +162,9 @@ 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, iop_timer_interrupt, IRQF_TIMER | IRQF_IRQPOLL,
+			"IOP Timer Tick", &iop_clockevent))
+		pr_err("Failed to request irq() %d (IOP Timer Tick)\n", irq);
 	iop_clockevent.cpumask = cpumask_of(0);
 	clockevents_config_and_register(&iop_clockevent, tick_rate,
 					0xf, 0xfffffffe);
Signature · 1 line
2.25.1
#28 lore raw

Re: [PATCH v3] ARM: replace setup_irq() by request_irq()

In reply to Arnd Bergmann

Hi,

Quoted 3 lines · Arnd Bergmann

I can probably fix it up here, but it would help if you can resend the remaining patches using git-send-email with all the tags added in and the normal subject lines.

i have sent the remaining patches using git send-email w/ all the tags collected and with normal subject lines, as a reply to your mail. They look okay in patchwork, let me know in case of any problems.

Regards
afzal

maintainer
#29 lore raw

Re: [PATCH v3] ARM: orion: replace setup_irq() by request_irq()

In reply to afzal mohammed

Hi afzal,

Quoted 11 lines

request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.

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().

[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos

Applied on mvebu/arm

Thanks,

Gregory

Quoted 54 lines

---
Hi sub-arch maintainers,

If the patch is okay, please take it thr' your tree.

Regards
afzal

v3:
* Split out from series, also split out from ARM patch to subarch level as Thomas suggested to take it thr' respective maintainers
* Modify string displayed in case of error as suggested by Thomas
* Re-arrange code as required to improve readability
* Remove irrelevant parts from commit message & improve

v2:
* Replace pr_err("request_irq() on %s failed" by

           pr_err("%s: request_irq() failed"

* Commit message massage

 arch/arm/plat-orion/time.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)
arch/arm/plat-orion/time.c +3 -7
index ffb93db68e9c..509d4824dc1c 100644
@@ -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("Failed to request irq %u (orion_tick)\n", irq);
 	orion_clkevt.cpumask = cpumask_of(0);
 	clockevents_config_and_register(&orion_clkevt, tclk, 1, 0xfffffffe);
 }
Signature · 1 line
2.25.1
Signature · 3 lines
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com