rtc: ds1307: use rtc_lock/rtc_unlock
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Tue, 19 Jan 2021 22:06:42 +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>
Link: https://lore.kernel.org/r/20210119220653.677750-4-alexandre.belloni@bootlin.com
drivers/rtc/rtc-ds1307.c

index 183cf7c01364cb8726444771d81a3cdf1aa1cdd0..cd8e438bc9c46b0baaa55727267b31e7cbffc2ac 100644 (file)
@@ -558,11 +558,10 @@ static u8 do_trickle_setup_rx8130(struct ds1307 *ds1307, u32 ohms, bool diode)
 static irqreturn_t rx8130_irq(int irq, void *dev_id)
 {
        struct ds1307           *ds1307 = dev_id;
-       struct mutex            *lock = &ds1307->rtc->ops_lock;
        u8 ctl[3];
        int ret;
 
-       mutex_lock(lock);
+       rtc_lock(ds1307->rtc);
 
        /* Read control registers. */
        ret = regmap_bulk_read(ds1307->regmap, RX8130_REG_EXTENSION, ctl,
@@ -582,7 +581,7 @@ static irqreturn_t rx8130_irq(int irq, void *dev_id)
        rtc_update_irq(ds1307->rtc, 1, RTC_AF | RTC_IRQF);
 
 out:
-       mutex_unlock(lock);
+       rtc_unlock(ds1307->rtc);
 
        return IRQ_HANDLED;
 }