rtc: simplify rtc_irq_set_state/rtc_irq_set_freq

The PIE doesn't handle tasks anymore, remove the pointer from the
interface.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c
index ae0d67610c7b5b14a6304b127a66e81b00bad4e2..76eb3a2957ccf6f43733d82d142665900cbc21aa 100644 (file)
--- a/drivers/rtc/interface.c
+++ b/drivers/rtc/interface.c
@@ -746,7 +746,7 @@ static int rtc_update_hrtimer(struct rtc_device *rtc, int enabled)
  * Note that rtc_irq_set_freq() should previously have been used to
  * specify the desired frequency of periodic IRQ.
  */
-int rtc_irq_set_state(struct rtc_device *rtc, struct rtc_task *task, int enabled)
+int rtc_irq_set_state(struct rtc_device *rtc, int enabled)
 {
        int err = 0;
 
@@ -770,7 +770,7 @@ EXPORT_SYMBOL_GPL(rtc_irq_set_state);
  * Note that rtc_irq_set_state() is used to enable or disable the
  * periodic IRQs.
  */
-int rtc_irq_set_freq(struct rtc_device *rtc, struct rtc_task *task, int freq)
+int rtc_irq_set_freq(struct rtc_device *rtc, int freq)
 {
        int err = 0;
 

diff --git a/drivers/rtc/rtc-dev.c b/drivers/rtc/rtc-dev.c
index efa221e8bc22da4b60f788b48768f59ef5fff220..43d962a9c2105a2f8f4aa84c35583a37cffe5e26 100644 (file)
--- a/drivers/rtc/rtc-dev.c
+++ b/drivers/rtc/rtc-dev.c
@@ -341,11 +341,11 @@ static long rtc_dev_ioctl(struct file *file,
                return rtc_set_time(rtc, &tm);
 
        case RTC_PIE_ON:
-               err = rtc_irq_set_state(rtc, NULL, 1);
+               err = rtc_irq_set_state(rtc, 1);
                break;
 
        case RTC_PIE_OFF:
-               err = rtc_irq_set_state(rtc, NULL, 0);
+               err = rtc_irq_set_state(rtc, 0);
                break;
 
        case RTC_AIE_ON:
@@ -365,7 +365,7 @@ static long rtc_dev_ioctl(struct file *file,
                return rtc_update_irq_enable(rtc, 0);
 
        case RTC_IRQP_SET:
-               err = rtc_irq_set_freq(rtc, NULL, arg);
+               err = rtc_irq_set_freq(rtc, arg);
                break;
 
        case RTC_IRQP_READ:
@@ -427,7 +427,7 @@ static int rtc_dev_release(struct inode *inode, struct file *file)
        /* Keep ioctl until all drivers are converted */
        rtc_dev_ioctl(file, RTC_UIE_OFF, 0);
        rtc_update_irq_enable(rtc, 0);
-       rtc_irq_set_state(rtc, NULL, 0);
+       rtc_irq_set_state(rtc, 0);
 
        clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags);
        return 0;

diff --git a/include/linux/rtc.h b/include/linux/rtc.h
index 8cc23fdfd4eed929ab299a8b47bfe59d4b9ede29..bf4d375025d16f12a9ea6f6d5c1aee3a85fce3cb 100644 (file)
--- a/include/linux/rtc.h
+++ b/include/linux/rtc.h
@@ -202,10 +202,8 @@ extern void rtc_update_irq(struct rtc_device *rtc,
 extern struct rtc_device *rtc_class_open(const char *name);
 extern void rtc_class_close(struct rtc_device *rtc);
 
-extern int rtc_irq_set_state(struct rtc_device *rtc,
-                               struct rtc_task *task, int enabled);
-extern int rtc_irq_set_freq(struct rtc_device *rtc,
-                               struct rtc_task *task, int freq);
+extern int rtc_irq_set_state(struct rtc_device *rtc, int enabled);
+extern int rtc_irq_set_freq(struct rtc_device *rtc, int freq);
 extern int rtc_update_irq_enable(struct rtc_device *rtc, unsigned int enabled);
 extern int rtc_alarm_irq_enable(struct rtc_device *rtc, unsigned int enabled);
 extern int rtc_dev_update_irq_enable_emul(struct rtc_device *rtc,