aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/rtc
diff options
context:
space:
mode:
authorHenri Roosen <henriroosen@gmail.com>2015-07-24 04:16:06 -0400
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2015-09-05 07:19:07 -0400
commitf2284f9c900a47961883b88064933a89b5dd5f46 (patch)
tree7c2d8d281709d1e052631f86ed29589404523108 /drivers/rtc
parent0d9030a2c3214cf8f9bfff84204e0f5ba5e790d7 (diff)
rtc: rx8025: remove obsolete local_irq_disable() and local_irq_enable() for rtc_update_irq()
Since commit e6229bec25be ("rtc: make rtc_update_irq callable with irqs enabled") rtc_update_irq() is callable with irqs enabled. Signed-off-by: Henri Roosen <henriroosen@gmail.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Diffstat (limited to 'drivers/rtc')
-rw-r--r--drivers/rtc/rtc-rx8025.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-rx8025.c b/drivers/rtc/rtc-rx8025.c
index a297542e2f8a..6fe87702fcff 100644
--- a/drivers/rtc/rtc-rx8025.c
+++ b/drivers/rtc/rtc-rx8025.c
@@ -161,9 +161,7 @@ static void rx8025_work(struct work_struct *work)
161 if (status & RX8025_BIT_CTRL2_CTFG) { 161 if (status & RX8025_BIT_CTRL2_CTFG) {
162 /* periodic */ 162 /* periodic */
163 status &= ~RX8025_BIT_CTRL2_CTFG; 163 status &= ~RX8025_BIT_CTRL2_CTFG;
164 local_irq_disable();
165 rtc_update_irq(rx8025->rtc, 1, RTC_PF | RTC_IRQF); 164 rtc_update_irq(rx8025->rtc, 1, RTC_PF | RTC_IRQF);
166 local_irq_enable();
167 } 165 }
168 166
169 if (status & RX8025_BIT_CTRL2_DAFG) { 167 if (status & RX8025_BIT_CTRL2_DAFG) {
@@ -172,9 +170,7 @@ static void rx8025_work(struct work_struct *work)
172 if (rx8025_write_reg(client, RX8025_REG_CTRL1, 170 if (rx8025_write_reg(client, RX8025_REG_CTRL1,
173 rx8025->ctrl1 & ~RX8025_BIT_CTRL1_DALE)) 171 rx8025->ctrl1 & ~RX8025_BIT_CTRL1_DALE))
174 goto out; 172 goto out;
175 local_irq_disable();
176 rtc_update_irq(rx8025->rtc, 1, RTC_AF | RTC_IRQF); 173 rtc_update_irq(rx8025->rtc, 1, RTC_AF | RTC_IRQF);
177 local_irq_enable();
178 } 174 }
179 175
180 /* acknowledge IRQ */ 176 /* acknowledge IRQ */