rtc: ds1685: use rtc_lock/rtc_unlock
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Tue, 19 Jan 2021 22:06:43 +0000 (23:06 +0100)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Mon, 25 Jan 2021 22:46:17 +0000 (23:46 +0100)
Avoid accessing directly rtc->ops_lock and use the RTC core helpers.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: Joshua Kinard <kumba@gentoo.org>
Link: https://lore.kernel.org/r/20210119220653.677750-5-alexandre.belloni@bootlin.com
drivers/rtc/rtc-ds1685.c

index d69c807..75db7ab 100644 (file)
@@ -658,7 +658,6 @@ ds1685_rtc_irq_handler(int irq, void *dev_id)
 {
        struct platform_device *pdev = dev_id;
        struct ds1685_priv *rtc = platform_get_drvdata(pdev);
-       struct mutex *rtc_mutex;
        u8 ctrlb, ctrlc;
        unsigned long events = 0;
        u8 num_irqs = 0;
@@ -667,8 +666,7 @@ ds1685_rtc_irq_handler(int irq, void *dev_id)
        if (unlikely(!rtc))
                return IRQ_HANDLED;
 
-       rtc_mutex = &rtc->dev->ops_lock;
-       mutex_lock(rtc_mutex);
+       rtc_lock(rtc->dev);
 
        /* Ctrlb holds the interrupt-enable bits and ctrlc the flag bits. */
        ctrlb = rtc->read(rtc, RTC_CTRL_B);
@@ -713,7 +711,7 @@ ds1685_rtc_irq_handler(int irq, void *dev_id)
                }
        }
        rtc_update_irq(rtc->dev, num_irqs, events);
-       mutex_unlock(rtc_mutex);
+       rtc_unlock(rtc->dev);
 
        return events ? IRQ_HANDLED : IRQ_NONE;
 }