1 files changed, 0 insertions, 17 deletions

diff --git a/drivers/clocksource/timer-imx-gpt.c b/drivers/clocksource/timer-imx-gpt.c
index a3d6ccbf4a16..706c0d0ff56c 100644
--- a/drivers/clocksource/timer-imx-gpt.c
+++ b/drivers/clocksource/timer-imx-gpt.c
@@ -202,15 +202,8 @@ static int v2_set_next_event(unsigned long evt,
 static int mxc_shutdown(struct clock_event_device *ced)
 {
         struct imx_timer *imxtm = to_imx_timer(ced);
-        unsigned long flags;
         u32 tcn;
 
-        /*
-         * The timer interrupt generation is disabled at least
-         * for enough time to call mxc_set_next_event()
-         */
-        local_irq_save(flags);
-
         /* Disable interrupt in GPT module */
         imxtm->gpt->gpt_irq_disable(imxtm);
 
@@ -225,21 +218,12 @@ static int mxc_shutdown(struct clock_event_device *ced)
         printk(KERN_INFO "%s: changing mode\n", __func__);
 #endif /* DEBUG */
 
-        local_irq_restore(flags);
-
         return 0;
 }
 
 static int mxc_set_oneshot(struct clock_event_device *ced)
 {
         struct imx_timer *imxtm = to_imx_timer(ced);
-        unsigned long flags;
-
-        /*
-         * The timer interrupt generation is disabled at least
-         * for enough time to call mxc_set_next_event()
-         */
-        local_irq_save(flags);
 
         /* Disable interrupt in GPT module */
         imxtm->gpt->gpt_irq_disable(imxtm);
@@ -264,7 +248,6 @@ static int mxc_set_oneshot(struct clock_event_device *ced)
          * mode switching
          */
         imxtm->gpt->gpt_irq_enable(imxtm);
-        local_irq_restore(flags);
 
         return 0;
 }