diff options
| author | Martin Kepplinger <martin.kepplinger@ginzinger.com> | 2017-04-10 11:37:18 +0200 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2017-04-27 11:54:46 +0100 |
| commit | d1f4f01a994b13e7cc3d682b816de7fc7e3463d9 (patch) | |
| tree | a7cbcab45d471a53c88bb1ca1ad2bb5b7b460697 /drivers/mfd | |
| parent | 76d3341b63a2ba173e7163c48918ec45934df98b (diff) | |
| download | linux-d1f4f01a994b13e7cc3d682b816de7fc7e3463d9.tar.bz2 | |
mfd: menelaus: Remove obsolete local_irq_disable() and local_irq_enable()
Since
commit e6229bec25be ("rtc: make rtc_update_irq callable with irqs enabled")
rtc_update_irq() is callable with irqs enabled, see the rtc drivers.
So update this accordingly.
Signed-off-by: Martin Kepplinger <martin.kepplinger@ginzinger.com>
Acked-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/menelaus.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index a4a8f1ec3fb6..29b7164a823b 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -1022,9 +1022,7 @@ static int menelaus_set_alarm(struct device *dev, struct rtc_wkalrm *w) static void menelaus_rtc_update_work(struct menelaus_chip *m) { /* report 1/sec update */ - local_irq_disable(); rtc_update_irq(m->rtc, 1, RTC_IRQF | RTC_UF); - local_irq_enable(); } static int menelaus_ioctl(struct device *dev, unsigned cmd, unsigned long arg) @@ -1086,9 +1084,7 @@ static const struct rtc_class_ops menelaus_rtc_ops = { static void menelaus_rtc_alarm_work(struct menelaus_chip *m) { /* report alarm */ - local_irq_disable(); rtc_update_irq(m->rtc, 1, RTC_IRQF | RTC_AF); - local_irq_enable(); /* then disable it; alarms are oneshot */ the_menelaus->rtc_control &= ~RTC_CTRL_AL_EN; |