Merge tag 'sfi-removal-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / rtc / rtc-ds1305.c

diff --git a/drivers/rtc/rtc-ds1305.c b/drivers/rtc/rtc-ds1305.c
index 8c2ab29..9ef107b 100644 (file)
--- a/drivers/rtc/rtc-ds1305.c
+++ b/drivers/rtc/rtc-ds1305.c
@@ -435,13 +435,12 @@ static const struct rtc_class_ops ds1305_ops = {
 static void ds1305_work(struct work_struct *work)
 {
        struct ds1305   *ds1305 = container_of(work, struct ds1305, work);
-       struct mutex    *lock = &ds1305->rtc->ops_lock;
        struct spi_device *spi = ds1305->spi;
        u8              buf[3];
        int             status;
 
        /* lock to protect ds1305->ctrl */
-       mutex_lock(lock);
+       rtc_lock(ds1305->rtc);
 
        /* Disable the IRQ, and clear its status ... for now, we "know"
         * that if more than one alarm is active, they're in sync.
@@ -459,7 +458,7 @@ static void ds1305_work(struct work_struct *work)
        if (status < 0)
                dev_dbg(&spi->dev, "clear irq --> %d\n", status);
 
-       mutex_unlock(lock);
+       rtc_unlock(ds1305->rtc);
 
        if (!test_bit(FLAG_EXITING, &ds1305->flags))
                enable_irq(spi->irq);