Commit 8719d3c9 authored by Alexandre Belloni's avatar Alexandre Belloni

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: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
parent acecb3ad
...@@ -746,7 +746,7 @@ static int rtc_update_hrtimer(struct rtc_device *rtc, int enabled) ...@@ -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 * Note that rtc_irq_set_freq() should previously have been used to
* specify the desired frequency of periodic IRQ. * 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; int err = 0;
...@@ -770,7 +770,7 @@ EXPORT_SYMBOL_GPL(rtc_irq_set_state); ...@@ -770,7 +770,7 @@ EXPORT_SYMBOL_GPL(rtc_irq_set_state);
* Note that rtc_irq_set_state() is used to enable or disable the * Note that rtc_irq_set_state() is used to enable or disable the
* periodic IRQs. * 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; int err = 0;
......
...@@ -341,11 +341,11 @@ static long rtc_dev_ioctl(struct file *file, ...@@ -341,11 +341,11 @@ static long rtc_dev_ioctl(struct file *file,
return rtc_set_time(rtc, &tm); return rtc_set_time(rtc, &tm);
case RTC_PIE_ON: case RTC_PIE_ON:
err = rtc_irq_set_state(rtc, NULL, 1); err = rtc_irq_set_state(rtc, 1);
break; break;
case RTC_PIE_OFF: case RTC_PIE_OFF:
err = rtc_irq_set_state(rtc, NULL, 0); err = rtc_irq_set_state(rtc, 0);
break; break;
case RTC_AIE_ON: case RTC_AIE_ON:
...@@ -365,7 +365,7 @@ static long rtc_dev_ioctl(struct file *file, ...@@ -365,7 +365,7 @@ static long rtc_dev_ioctl(struct file *file,
return rtc_update_irq_enable(rtc, 0); return rtc_update_irq_enable(rtc, 0);
case RTC_IRQP_SET: case RTC_IRQP_SET:
err = rtc_irq_set_freq(rtc, NULL, arg); err = rtc_irq_set_freq(rtc, arg);
break; break;
case RTC_IRQP_READ: case RTC_IRQP_READ:
...@@ -427,7 +427,7 @@ static int rtc_dev_release(struct inode *inode, struct file *file) ...@@ -427,7 +427,7 @@ static int rtc_dev_release(struct inode *inode, struct file *file)
/* Keep ioctl until all drivers are converted */ /* Keep ioctl until all drivers are converted */
rtc_dev_ioctl(file, RTC_UIE_OFF, 0); rtc_dev_ioctl(file, RTC_UIE_OFF, 0);
rtc_update_irq_enable(rtc, 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); clear_bit_unlock(RTC_DEV_BUSY, &rtc->flags);
return 0; return 0;
......
...@@ -202,10 +202,8 @@ extern void rtc_update_irq(struct rtc_device *rtc, ...@@ -202,10 +202,8 @@ extern void rtc_update_irq(struct rtc_device *rtc,
extern struct rtc_device *rtc_class_open(const char *name); extern struct rtc_device *rtc_class_open(const char *name);
extern void rtc_class_close(struct rtc_device *rtc); extern void rtc_class_close(struct rtc_device *rtc);
extern int rtc_irq_set_state(struct rtc_device *rtc, extern int rtc_irq_set_state(struct rtc_device *rtc, int enabled);
struct rtc_task *task, int enabled); extern int rtc_irq_set_freq(struct rtc_device *rtc, int freq);
extern int rtc_irq_set_freq(struct rtc_device *rtc,
struct rtc_task *task, int freq);
extern int rtc_update_irq_enable(struct rtc_device *rtc, unsigned int enabled); 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_alarm_irq_enable(struct rtc_device *rtc, unsigned int enabled);
extern int rtc_dev_update_irq_enable_emul(struct rtc_device *rtc, extern int rtc_dev_update_irq_enable_emul(struct rtc_device *rtc,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment