diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-11-03 23:42:16 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-11-03 23:42:16 +0100 |
commit | 23a12ddee1ce28065b71f14ccc695b5a0c8a64ff (patch) | |
tree | cedaa1cde5b2557116e523c31552187804704093 /drivers/rtc/interface.c | |
parent | 98f76206b33504b934209d16196477dfa519a807 (diff) | |
parent | bcb6fb5da77c2a228adf07cc9cb1a0c2aa2001c6 (diff) |
Merge branch 'core/urgent' into x86/urgent, to pick up objtool fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/rtc/interface.c')
-rw-r--r-- | drivers/rtc/interface.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index 3d577e259e91..612a83d3ddcc 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c @@ -596,7 +596,6 @@ EXPORT_SYMBOL_GPL(rtc_update_irq_enable); * This function is called when an AIE, UIE or PIE mode interrupt * has occurred (or been emulated). * - * Triggers the registered irq_task function callback. */ void rtc_handle_legacy_irq(struct rtc_device *rtc, int num, int mode) { @@ -741,7 +740,6 @@ static int rtc_update_hrtimer(struct rtc_device *rtc, int enabled) /** * rtc_irq_set_state - enable/disable 2^N Hz periodic IRQs * @rtc: the rtc device - * @task: currently registered with rtc_irq_register() * @enabled: true to enable periodic IRQs * Context: any * @@ -764,7 +762,6 @@ int rtc_irq_set_state(struct rtc_device *rtc, int enabled) /** * rtc_irq_set_freq - set 2^N Hz periodic IRQ frequency for IRQ * @rtc: the rtc device - * @task: currently registered with rtc_irq_register() * @freq: positive frequency * Context: any * |