diff options
| author | Michael Opdenacker <michael.opdenacker@free-electrons.com> | 2013-12-09 04:12:10 -0500 |
|---|---|---|
| committer | Daniel Lezcano <daniel.lezcano@linaro.org> | 2013-12-11 05:40:27 -0500 |
| commit | 38c30a8421ce8b06492121deee422ba7ecfaeef2 (patch) | |
| tree | 0d184b7247c5606e73f3f5a2fbc601646954b16c /drivers/clocksource | |
| parent | 87d4bb9fced08054afb83af2d85f5cf0ba0e21e4 (diff) | |
clocksource: misc drivers: Remove deprecated IRQF_DISABLED
This patch removes the use of the IRQF_DISABLED flag
It's a NOOP since 2.6.35 and it will be removed one day.
[dlezcano] : slightly changed the changelog
Signed-off-by: Michael Opdenacker <michael.opdenacker@free-electrons.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Diffstat (limited to 'drivers/clocksource')
| -rw-r--r-- | drivers/clocksource/cadence_ttc_timer.c | 3 | ||||
| -rw-r--r-- | drivers/clocksource/cs5535-clockevt.c | 2 | ||||
| -rw-r--r-- | drivers/clocksource/dw_apb_timer.c | 3 | ||||
| -rw-r--r-- | drivers/clocksource/nomadik-mtu.c | 2 | ||||
| -rw-r--r-- | drivers/clocksource/samsung_pwm_timer.c | 2 | ||||
| -rw-r--r-- | drivers/clocksource/sh_cmt.c | 3 | ||||
| -rw-r--r-- | drivers/clocksource/sh_mtu2.c | 3 | ||||
| -rw-r--r-- | drivers/clocksource/sh_tmu.c | 3 |
8 files changed, 8 insertions, 13 deletions
diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c index b865b4e3d67b..8c7382bf260c 100644 --- a/drivers/clocksource/cadence_ttc_timer.c +++ b/drivers/clocksource/cadence_ttc_timer.c | |||
| @@ -388,8 +388,7 @@ static void __init ttc_setup_clockevent(struct clk *clk, | |||
| 388 | __raw_writel(0x1, ttcce->ttc.base_addr + TTC_IER_OFFSET); | 388 | __raw_writel(0x1, ttcce->ttc.base_addr + TTC_IER_OFFSET); |
| 389 | 389 | ||
| 390 | err = request_irq(irq, ttc_clock_event_interrupt, | 390 | err = request_irq(irq, ttc_clock_event_interrupt, |
| 391 | IRQF_DISABLED | IRQF_TIMER, | 391 | IRQF_TIMER, ttcce->ce.name, ttcce); |
| 392 | ttcce->ce.name, ttcce); | ||
| 393 | if (WARN_ON(err)) { | 392 | if (WARN_ON(err)) { |
| 394 | kfree(ttcce); | 393 | kfree(ttcce); |
| 395 | return; | 394 | return; |
diff --git a/drivers/clocksource/cs5535-clockevt.c b/drivers/clocksource/cs5535-clockevt.c index ea210482dd20..db2105290898 100644 --- a/drivers/clocksource/cs5535-clockevt.c +++ b/drivers/clocksource/cs5535-clockevt.c | |||
| @@ -131,7 +131,7 @@ static irqreturn_t mfgpt_tick(int irq, void *dev_id) | |||
| 131 | 131 | ||
| 132 | static struct irqaction mfgptirq = { | 132 | static struct irqaction mfgptirq = { |
| 133 | .handler = mfgpt_tick, | 133 | .handler = mfgpt_tick, |
| 134 | .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_TIMER | IRQF_SHARED, | 134 | .flags = IRQF_NOBALANCING | IRQF_TIMER | IRQF_SHARED, |
| 135 | .name = DRV_NAME, | 135 | .name = DRV_NAME, |
| 136 | }; | 136 | }; |
| 137 | 137 | ||
diff --git a/drivers/clocksource/dw_apb_timer.c b/drivers/clocksource/dw_apb_timer.c index e54ca1062d8e..f3656a6b0382 100644 --- a/drivers/clocksource/dw_apb_timer.c +++ b/drivers/clocksource/dw_apb_timer.c | |||
| @@ -243,8 +243,7 @@ dw_apb_clockevent_init(int cpu, const char *name, unsigned rating, | |||
| 243 | dw_ced->irqaction.dev_id = &dw_ced->ced; | 243 | dw_ced->irqaction.dev_id = &dw_ced->ced; |
| 244 | dw_ced->irqaction.irq = irq; | 244 | dw_ced->irqaction.irq = irq; |
| 245 | dw_ced->irqaction.flags = IRQF_TIMER | IRQF_IRQPOLL | | 245 | dw_ced->irqaction.flags = IRQF_TIMER | IRQF_IRQPOLL | |
| 246 | IRQF_NOBALANCING | | 246 | IRQF_NOBALANCING; |
| 247 | IRQF_DISABLED; | ||
| 248 | 247 | ||
| 249 | dw_ced->eoi = apbt_eoi; | 248 | dw_ced->eoi = apbt_eoi; |
| 250 | err = setup_irq(irq, &dw_ced->irqaction); | 249 | err = setup_irq(irq, &dw_ced->irqaction); |
diff --git a/drivers/clocksource/nomadik-mtu.c b/drivers/clocksource/nomadik-mtu.c index ed7b73b508e0..152a3f3875ee 100644 --- a/drivers/clocksource/nomadik-mtu.c +++ b/drivers/clocksource/nomadik-mtu.c | |||
| @@ -187,7 +187,7 @@ static irqreturn_t nmdk_timer_interrupt(int irq, void *dev_id) | |||
| 187 | 187 | ||
| 188 | static struct irqaction nmdk_timer_irq = { | 188 | static struct irqaction nmdk_timer_irq = { |
| 189 | .name = "Nomadik Timer Tick", | 189 | .name = "Nomadik Timer Tick", |
| 190 | .flags = IRQF_DISABLED | IRQF_TIMER, | 190 | .flags = IRQF_TIMER, |
| 191 | .handler = nmdk_timer_interrupt, | 191 | .handler = nmdk_timer_interrupt, |
| 192 | .dev_id = &nmdk_clkevt, | 192 | .dev_id = &nmdk_clkevt, |
| 193 | }; | 193 | }; |
diff --git a/drivers/clocksource/samsung_pwm_timer.c b/drivers/clocksource/samsung_pwm_timer.c index 85082e8d3052..5645cfc90c41 100644 --- a/drivers/clocksource/samsung_pwm_timer.c +++ b/drivers/clocksource/samsung_pwm_timer.c | |||
| @@ -264,7 +264,7 @@ static irqreturn_t samsung_clock_event_isr(int irq, void *dev_id) | |||
| 264 | 264 | ||
| 265 | static struct irqaction samsung_clock_event_irq = { | 265 | static struct irqaction samsung_clock_event_irq = { |
| 266 | .name = "samsung_time_irq", | 266 | .name = "samsung_time_irq", |
| 267 | .flags = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL, | 267 | .flags = IRQF_TIMER | IRQF_IRQPOLL, |
| 268 | .handler = samsung_clock_event_isr, | 268 | .handler = samsung_clock_event_isr, |
| 269 | .dev_id = &time_event_device, | 269 | .dev_id = &time_event_device, |
| 270 | }; | 270 | }; |
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index 0965e9848b3d..c6186339dd52 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c | |||
| @@ -726,8 +726,7 @@ static int sh_cmt_setup(struct sh_cmt_priv *p, struct platform_device *pdev) | |||
| 726 | p->irqaction.name = dev_name(&p->pdev->dev); | 726 | p->irqaction.name = dev_name(&p->pdev->dev); |
| 727 | p->irqaction.handler = sh_cmt_interrupt; | 727 | p->irqaction.handler = sh_cmt_interrupt; |
| 728 | p->irqaction.dev_id = p; | 728 | p->irqaction.dev_id = p; |
| 729 | p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | \ | 729 | p->irqaction.flags = IRQF_TIMER | IRQF_IRQPOLL | IRQF_NOBALANCING; |
| 730 | IRQF_IRQPOLL | IRQF_NOBALANCING; | ||
| 731 | 730 | ||
| 732 | /* get hold of clock */ | 731 | /* get hold of clock */ |
| 733 | p->clk = clk_get(&p->pdev->dev, "cmt_fck"); | 732 | p->clk = clk_get(&p->pdev->dev, "cmt_fck"); |
diff --git a/drivers/clocksource/sh_mtu2.c b/drivers/clocksource/sh_mtu2.c index f02648e27f7e..b6a56b1c8947 100644 --- a/drivers/clocksource/sh_mtu2.c +++ b/drivers/clocksource/sh_mtu2.c | |||
| @@ -302,8 +302,7 @@ static int sh_mtu2_setup(struct sh_mtu2_priv *p, struct platform_device *pdev) | |||
| 302 | p->irqaction.handler = sh_mtu2_interrupt; | 302 | p->irqaction.handler = sh_mtu2_interrupt; |
| 303 | p->irqaction.dev_id = p; | 303 | p->irqaction.dev_id = p; |
| 304 | p->irqaction.irq = irq; | 304 | p->irqaction.irq = irq; |
| 305 | p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | \ | 305 | p->irqaction.flags = IRQF_TIMER | IRQF_IRQPOLL | IRQF_NOBALANCING; |
| 306 | IRQF_IRQPOLL | IRQF_NOBALANCING; | ||
| 307 | 306 | ||
| 308 | /* get hold of clock */ | 307 | /* get hold of clock */ |
| 309 | p->clk = clk_get(&p->pdev->dev, "mtu2_fck"); | 308 | p->clk = clk_get(&p->pdev->dev, "mtu2_fck"); |
diff --git a/drivers/clocksource/sh_tmu.c b/drivers/clocksource/sh_tmu.c index 54ab47553701..fc752f7b2719 100644 --- a/drivers/clocksource/sh_tmu.c +++ b/drivers/clocksource/sh_tmu.c | |||
| @@ -462,8 +462,7 @@ static int sh_tmu_setup(struct sh_tmu_priv *p, struct platform_device *pdev) | |||
| 462 | p->irqaction.handler = sh_tmu_interrupt; | 462 | p->irqaction.handler = sh_tmu_interrupt; |
| 463 | p->irqaction.dev_id = p; | 463 | p->irqaction.dev_id = p; |
| 464 | p->irqaction.irq = irq; | 464 | p->irqaction.irq = irq; |
| 465 | p->irqaction.flags = IRQF_DISABLED | IRQF_TIMER | \ | 465 | p->irqaction.flags = IRQF_TIMER | IRQF_IRQPOLL | IRQF_NOBALANCING; |
| 466 | IRQF_IRQPOLL | IRQF_NOBALANCING; | ||
| 467 | 466 | ||
| 468 | /* get hold of clock */ | 467 | /* get hold of clock */ |
| 469 | p->clk = clk_get(&p->pdev->dev, "tmu_fck"); | 468 | p->clk = clk_get(&p->pdev->dev, "tmu_fck"); |
