clocksource: misc drivers: remove deprecated IRQF_DISABLED
PATCH 1/1 clocksource: misc drivers: remove deprecated IRQF_DISABLED
This patch proposes to remove the use of the IRQF_DISABLED flag
It's a NOOP since 2.6.35 and it will be removed one day.
--- drivers/clocksource/cadence_ttc_timer.c | 3 +-- drivers/clocksource/cs5535-clockevt.c | 2 +- drivers/clocksource/dw_apb_timer.c | 3 +-- drivers/clocksource/nomadik-mtu.c | 2 +- drivers/clocksource/samsung_pwm_timer.c | 2 +- drivers/clocksource/sh_cmt.c | 3 +-- drivers/clocksource/sh_mtu2.c | 3 +-- drivers/clocksource/sh_tmu.c | 3 +-- drivers/clocksource/sun4i_timer.c | 2 +- 9 files changed, 9 insertions(+), 14 deletions(-)
drivers/clocksource/cadence_ttc_timer.c +1 -2
@@ -388,8 +388,7 @@ static void __init ttc_setup_clockevent(struct clk *clk,__raw_writel (0x1 , ttcce->ttc.base_addr +TTC_IER_OFFSET ); err =request_irq (irq, ttc_clock_event_interrupt, -IRQF_DISABLED |IRQF_TIMER , - ttcce->ce.name, ttcce); +IRQF_TIMER , ttcce->ce.name, ttcce);if (WARN_ON (err)) {kfree (ttcce);return ;
drivers/clocksource/cs5535-clockevt.c +1 -1
@@ -131,7 +131,7 @@ static irqreturn_t mfgpt_tick(int irq, void *dev_id)static struct irqaction mfgptirq = { .handler = mfgpt_tick, - .flags =IRQF_DISABLED |IRQF_NOBALANCING |IRQF_TIMER |IRQF_SHARED , + .flags =IRQF_NOBALANCING |IRQF_TIMER |IRQF_SHARED , .name =DRV_NAME , };
drivers/clocksource/dw_apb_timer.c +1 -2
@@ -243,8 +243,7 @@ dw_apb_clockevent_init(int cpu, const char *name, unsigned rating, dw_ced->irqaction.dev_id = &dw_ced->ced; dw_ced->irqaction.irq = irq; dw_ced->irqaction.flags =IRQF_TIMER |IRQF_IRQPOLL | -IRQF_NOBALANCING | -IRQF_DISABLED ; +IRQF_NOBALANCING ; dw_ced->eoi = apbt_eoi; err =setup_irq (irq, &dw_ced->irqaction);
drivers/clocksource/nomadik-mtu.c +1 -1
@@ -187,7 +187,7 @@ static irqreturn_t nmdk_timer_interrupt(int irq, void *dev_id)static struct irqaction nmdk_timer_irq = { .name ="Nomadik Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER , + .flags =IRQF_TIMER , .handler = nmdk_timer_interrupt, .dev_id = &nmdk_clkevt, };
drivers/clocksource/samsung_pwm_timer.c +1 -1
@@ -264,7 +264,7 @@ static irqreturn_t samsung_clock_event_isr(int irq, void *dev_id)static struct irqaction samsung_clock_event_irq = { .name ="samsung_time_irq" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = samsung_clock_event_isr, .dev_id = &time_event_device, };
drivers/clocksource/sh_cmt.c +1 -2
@@ -726,8 +726,7 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev) p->irqaction.name =dev_name (&p->pdev->dev); p->irqaction.handler = sh_cmt_interrupt; p->irqaction.dev_id = p; - p->irqaction.flags =IRQF_DISABLED |IRQF_TIMER | \ -IRQF_IRQPOLL |IRQF_NOBALANCING ; + p->irqaction.flags =IRQF_TIMER |IRQF_IRQPOLL |IRQF_NOBALANCING ;/* get hold of clock */ p->clk =clk_get (&p->pdev->dev,"cmt_fck" );
drivers/clocksource/sh_mtu2.c +1 -2
@@ -302,8 +302,7 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev) p->irqaction.handler = sh_mtu2_interrupt; p->irqaction.dev_id = p; p->irqaction.irq = irq; - p->irqaction.flags =IRQF_DISABLED |IRQF_TIMER | \ -IRQF_IRQPOLL |IRQF_NOBALANCING ; + p->irqaction.flags =IRQF_TIMER |IRQF_IRQPOLL |IRQF_NOBALANCING ;/* get hold of clock */ p->clk =clk_get (&p->pdev->dev,"mtu2_fck" );
drivers/clocksource/sh_tmu.c +1 -2
@@ -462,8 +462,7 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev) p->irqaction.handler = sh_tmu_interrupt; p->irqaction.dev_id = p; p->irqaction.irq = irq; - p->irqaction.flags =IRQF_DISABLED |IRQF_TIMER | \ -IRQF_IRQPOLL |IRQF_NOBALANCING ; + p->irqaction.flags =IRQF_TIMER |IRQF_IRQPOLL |IRQF_NOBALANCING ;/* get hold of clock */ p->clk =clk_get (&p->pdev->dev,"tmu_fck" );
drivers/clocksource/sun4i_timer.c +1 -1
@@ -131,7 +131,7 @@ static irqreturn_t sun4i_timer_interrupt(int irq, void *dev_id)static struct irqaction sun4i_timer_irq = { .name ="sun4i_timer0" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = sun4i_timer_interrupt, .dev_id = &sun4i_clockevent, };
Signature · 1 line
1.8.1.2
PATCH RESEND 1/1 clocksource: misc drivers: remove deprecated IRQF_DISABLED
This patch proposes to remove the use of the IRQF_DISABLED flag
It's a NOOP since 2.6.35 and it will be removed one day.
--- drivers/clocksource/cadence_ttc_timer.c | 3 +-- drivers/clocksource/cs5535-clockevt.c | 2 +- drivers/clocksource/dw_apb_timer.c | 3 +-- drivers/clocksource/nomadik-mtu.c | 2 +- drivers/clocksource/samsung_pwm_timer.c | 2 +- drivers/clocksource/sh_cmt.c | 3 +-- drivers/clocksource/sh_mtu2.c | 3 +-- drivers/clocksource/sh_tmu.c | 3 +-- 8 files changed, 8 insertions(+), 13 deletions(-)
drivers/clocksource/cadence_ttc_timer.c +1 -2
@@ -388,8 +388,7 @@ static void __init ttc_setup_clockevent(struct clk *clk,__raw_writel (0x1 , ttcce->ttc.base_addr +TTC_IER_OFFSET ); err =request_irq (irq, ttc_clock_event_interrupt, -IRQF_DISABLED |IRQF_TIMER , - ttcce->ce.name, ttcce); +IRQF_TIMER , ttcce->ce.name, ttcce);if (WARN_ON (err)) {kfree (ttcce);return ;
drivers/clocksource/cs5535-clockevt.c +1 -1
@@ -131,7 +131,7 @@ static irqreturn_t mfgpt_tick(int irq, void *dev_id)static struct irqaction mfgptirq = { .handler = mfgpt_tick, - .flags =IRQF_DISABLED |IRQF_NOBALANCING |IRQF_TIMER |IRQF_SHARED , + .flags =IRQF_NOBALANCING |IRQF_TIMER |IRQF_SHARED , .name =DRV_NAME , };
drivers/clocksource/dw_apb_timer.c +1 -2
@@ -243,8 +243,7 @@ dw_apb_clockevent_init(int cpu, const char *name, unsigned rating, dw_ced->irqaction.dev_id = &dw_ced->ced; dw_ced->irqaction.irq = irq; dw_ced->irqaction.flags =IRQF_TIMER |IRQF_IRQPOLL | -IRQF_NOBALANCING | -IRQF_DISABLED ; +IRQF_NOBALANCING ; dw_ced->eoi = apbt_eoi; err =setup_irq (irq, &dw_ced->irqaction);
drivers/clocksource/nomadik-mtu.c +1 -1
@@ -187,7 +187,7 @@ static irqreturn_t nmdk_timer_interrupt(int irq, void *dev_id)static struct irqaction nmdk_timer_irq = { .name ="Nomadik Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER , + .flags =IRQF_TIMER , .handler = nmdk_timer_interrupt, .dev_id = &nmdk_clkevt, };
drivers/clocksource/samsung_pwm_timer.c +1 -1
@@ -264,7 +264,7 @@ static irqreturn_t samsung_clock_event_isr(int irq, void *dev_id)static struct irqaction samsung_clock_event_irq = { .name ="samsung_time_irq" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = samsung_clock_event_isr, .dev_id = &time_event_device, };
drivers/clocksource/sh_cmt.c +1 -2
@@ -726,8 +726,7 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev) p->irqaction.name =dev_name (&p->pdev->dev); p->irqaction.handler = sh_cmt_interrupt; p->irqaction.dev_id = p; - p->irqaction.flags =IRQF_DISABLED |IRQF_TIMER | \ -IRQF_IRQPOLL |IRQF_NOBALANCING ; + p->irqaction.flags =IRQF_TIMER |IRQF_IRQPOLL |IRQF_NOBALANCING ;/* get hold of clock */ p->clk =clk_get (&p->pdev->dev,"cmt_fck" );
drivers/clocksource/sh_mtu2.c +1 -2
@@ -302,8 +302,7 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev) p->irqaction.handler = sh_mtu2_interrupt; p->irqaction.dev_id = p; p->irqaction.irq = irq; - p->irqaction.flags =IRQF_DISABLED |IRQF_TIMER | \ -IRQF_IRQPOLL |IRQF_NOBALANCING ; + p->irqaction.flags =IRQF_TIMER |IRQF_IRQPOLL |IRQF_NOBALANCING ;/* get hold of clock */ p->clk =clk_get (&p->pdev->dev,"mtu2_fck" );
drivers/clocksource/sh_tmu.c +1 -2
@@ -462,8 +462,7 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev) p->irqaction.handler = sh_tmu_interrupt; p->irqaction.dev_id = p; p->irqaction.irq = irq; - p->irqaction.flags =IRQF_DISABLED |IRQF_TIMER | \ -IRQF_IRQPOLL |IRQF_NOBALANCING ; + p->irqaction.flags =IRQF_TIMER |IRQF_IRQPOLL |IRQF_NOBALANCING ;/* get hold of clock */ p->clk =clk_get (&p->pdev->dev,"tmu_fck" );
Signature · 1 line
1.8.3.2
Quoted 6 lines · Michael Opdenacker
This patch proposes to remove the use of the
IRQF_DISABLEDflagIt's a NOOP since 2.6.35 and it will be removed one day.
Signed-off-by Michael Opdenacker <[email protected]>---
Hi Michael,
the three patches are applied to my tree for 3.14.
I changed a bit the changelog by replacing 'proposes to remove' by 'removes' and added a capitalized letter for the first character of the short description (eg. remove deprecated => Remove deprecated).
In the future please take care of that.
Thanks for the cleanups.
-- Daniel
Quoted 120 lines
drivers/clocksource/cadence_ttc_timer.c | 3 +-- drivers/clocksource/cs5535-clockevt.c | 2 +- drivers/clocksource/dw_apb_timer.c | 3 +-- drivers/clocksource/nomadik-mtu.c | 2 +- drivers/clocksource/samsung_pwm_timer.c | 2 +- drivers/clocksource/sh_cmt.c | 3 +-- drivers/clocksource/sh_mtu2.c | 3 +-- drivers/clocksource/sh_tmu.c | 3 +-- 8 files changed, 8 insertions(+), 13 deletions(-)drivers/clocksource/cadence_ttc_timer.c +1
-2@@ -388,8 +388,7 @@ static void __init ttc_setup_clockevent(struct clk *clk,__raw_writel (0x1 , ttcce->ttc.base_addr +TTC_IER_OFFSET ); err =request_irq (irq, ttc_clock_event_interrupt, -IRQF_DISABLED |IRQF_TIMER , - ttcce->ce.name, ttcce); +IRQF_TIMER , ttcce->ce.name, ttcce);if (WARN_ON (err)) {kfree (ttcce);return ;drivers/clocksource/cs5535-clockevt.c +1
-1@@ -131,7 +131,7 @@ static irqreturn_t mfgpt_tick(int irq, void *dev_id)static struct irqaction mfgptirq = { .handler = mfgpt_tick, - .flags =IRQF_DISABLED |IRQF_NOBALANCING |IRQF_TIMER |IRQF_SHARED , + .flags =IRQF_NOBALANCING |IRQF_TIMER |IRQF_SHARED , .name =DRV_NAME , };drivers/clocksource/dw_apb_timer.c +1
-2@@ -243,8 +243,7 @@ dw_apb_clockevent_init(int cpu, const char *name, unsigned rating, dw_ced->irqaction.dev_id = &dw_ced->ced; dw_ced->irqaction.irq = irq; dw_ced->irqaction.flags =IRQF_TIMER |IRQF_IRQPOLL | -IRQF_NOBALANCING | -IRQF_DISABLED ; +IRQF_NOBALANCING ; dw_ced->eoi = apbt_eoi; err =setup_irq (irq, &dw_ced->irqaction);drivers/clocksource/nomadik-mtu.c +1
-1@@ -187,7 +187,7 @@ static irqreturn_t nmdk_timer_interrupt(int irq, void *dev_id)static struct irqaction nmdk_timer_irq = { .name ="Nomadik Timer Tick" , - .flags =IRQF_DISABLED |IRQF_TIMER , + .flags =IRQF_TIMER , .handler = nmdk_timer_interrupt, .dev_id = &nmdk_clkevt, };drivers/clocksource/samsung_pwm_timer.c +1
-1@@ -264,7 +264,7 @@ static irqreturn_t samsung_clock_event_isr(int irq, void *dev_id)static struct irqaction samsung_clock_event_irq = { .name ="samsung_time_irq" , - .flags =IRQF_DISABLED |IRQF_TIMER |IRQF_IRQPOLL , + .flags =IRQF_TIMER |IRQF_IRQPOLL , .handler = samsung_clock_event_isr, .dev_id = &time_event_device, };drivers/clocksource/sh_cmt.c +1
-2@@ -726,8 +726,7 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev) p->irqaction.name =dev_name (&p->pdev->dev); p->irqaction.handler = sh_cmt_interrupt; p->irqaction.dev_id = p; - p->irqaction.flags =IRQF_DISABLED |IRQF_TIMER | \ -IRQF_IRQPOLL |IRQF_NOBALANCING ; + p->irqaction.flags =IRQF_TIMER |IRQF_IRQPOLL |IRQF_NOBALANCING ;/* get hold of clock */ p->clk =clk_get (&p->pdev->dev,"cmt_fck" );drivers/clocksource/sh_mtu2.c +1
-2@@ -302,8 +302,7 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev) p->irqaction.handler = sh_mtu2_interrupt; p->irqaction.dev_id = p; p->irqaction.irq = irq; - p->irqaction.flags =IRQF_DISABLED |IRQF_TIMER | \ -IRQF_IRQPOLL |IRQF_NOBALANCING ; + p->irqaction.flags =IRQF_TIMER |IRQF_IRQPOLL |IRQF_NOBALANCING ;/* get hold of clock */ p->clk =clk_get (&p->pdev->dev,"mtu2_fck" );drivers/clocksource/sh_tmu.c +1
-2@@ -462,8 +462,7 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev) p->irqaction.handler = sh_tmu_interrupt; p->irqaction.dev_id = p; p->irqaction.irq = irq; - p->irqaction.flags =IRQF_DISABLED |IRQF_TIMER | \ -IRQF_IRQPOLL |IRQF_NOBALANCING ; + p->irqaction.flags =IRQF_TIMER |IRQF_IRQPOLL |IRQF_NOBALANCING ;/* get hold of clock */ p->clk =clk_get (&p->pdev->dev,"tmu_fck" );
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
Hi Daniel,
Quoted 5 lines · Daniel Lezcano
Quoted 4 lines · Michael Opdenacker
This patch proposes to remove the use of the
IRQF_DISABLEDflagIt's a NOOP since 2.6.35 and it will be removed one day.
Quoted 7 lines
Quoted 3 lines
Signed-off-by: Michael Opdenacker
<[email protected]>
---Hi Michael,
the three patches are applied to my tree for 3.14.
Great, thanks!
Quoted 6 lines
I changed a bit the changelog by replacing 'proposes to remove' by 'removes' and added a capitalized letter for the first character of the short description (eg. remove deprecated => Remove deprecated).
In the future please take care of that.
This makes perfect sense. I promise to pay attention to this in the future!
Thank you for the good advice!
Michael.
Signature · 4 lines
Michael Opdenacker, CEO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com +33 484 258 098