]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
char: rtc: remove task handling
authorAlexandre Belloni <alexandre.belloni@bootlin.com>
Thu, 26 Jul 2018 13:40:55 +0000 (15:40 +0200)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Thu, 2 Aug 2018 15:16:03 +0000 (17:16 +0200)
Since commit 9e7002a70e42 ("char: rtc: remove unused rtc_control() API"),
it is not possible to set a callback anymore, remove its handling from the
interrupt handler.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/char/rtc.c

index 94fedeeec0356b7a9f818b72369cca1bd312379e..4948c8bda6b1fb7d5dc1dd734f52ebc11307aa99 100644 (file)
@@ -193,14 +193,6 @@ static unsigned long rtc_freq;             /* Current periodic IRQ rate    */
 static unsigned long rtc_irq_data;     /* our output to the world      */
 static unsigned long rtc_max_user_freq = 64; /* > this, need CAP_SYS_RESOURCE */
 
-#ifdef RTC_IRQ
-/*
- * rtc_task_lock nests inside rtc_lock.
- */
-static DEFINE_SPINLOCK(rtc_task_lock);
-static rtc_task_t *rtc_callback;
-#endif
-
 /*
  *     If this driver ever becomes modularised, it will be really nice
  *     to make the epoch retain its value across module reload...
@@ -264,11 +256,6 @@ static irqreturn_t rtc_interrupt(int irq, void *dev_id)
 
        spin_unlock(&rtc_lock);
 
-       /* Now do the rest of the actions */
-       spin_lock(&rtc_task_lock);
-       if (rtc_callback)
-               rtc_callback->func(rtc_callback->private_data);
-       spin_unlock(&rtc_task_lock);
        wake_up_interruptible(&rtc_wait);
 
        kill_fasync(&rtc_async_queue, SIGIO, POLL_IN);