aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPratyush Patel <pratyushpatel.1995@gmail.com>2016-06-14 11:00:42 +0200
committerJohn Stultz <john.stultz@linaro.org>2016-06-20 12:47:09 -0700
commitaf4afb40085f04f8b2ea8d28df878f7f0be02f89 (patch)
tree4e4b10c9d665ac71fd2fc5435ec83da81dc6c354
parenttimekeeping: Fix 1ns/tick drift with GENERIC_TIME_VSYSCALL_OLD (diff)
downloadlinux-dev-af4afb40085f04f8b2ea8d28df878f7f0be02f89.tar.xz
linux-dev-af4afb40085f04f8b2ea8d28df878f7f0be02f89.zip
alarmtimer: Fix comments describing structure fields
Updated struct alarm and struct alarm_timer descriptions. Cc: Prarit Bhargava <prarit@redhat.com> Cc: Richard Cochran <richardcochran@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Ingo Molnar <mingo@kernel.org> Signed-off-by: Pratyush Patel <pratyushpatel.1995@gmail.com> Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r--include/linux/alarmtimer.h6
-rw-r--r--kernel/time/alarmtimer.c1
2 files changed, 3 insertions, 4 deletions
diff --git a/include/linux/alarmtimer.h b/include/linux/alarmtimer.h
index 52f3b7da4f2d..9d8031257a90 100644
--- a/include/linux/alarmtimer.h
+++ b/include/linux/alarmtimer.h
@@ -26,10 +26,10 @@ enum alarmtimer_restart {
* struct alarm - Alarm timer structure
* @node: timerqueue node for adding to the event list this value
* also includes the expiration time.
- * @period: Period for recuring alarms
+ * @timer: hrtimer used to schedule events while running
* @function: Function pointer to be executed when the timer fires.
- * @type: Alarm type (BOOTTIME/REALTIME)
- * @enabled: Flag that represents if the alarm is set to fire or not
+ * @type: Alarm type (BOOTTIME/REALTIME).
+ * @state: Flag that represents if the alarm is set to fire or not.
* @data: Internal data value.
*/
struct alarm {
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index e840ed867a5d..c3aad685bbc0 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -30,7 +30,6 @@
* struct alarm_base - Alarm timer bases
* @lock: Lock for syncrhonized access to the base
* @timerqueue: Timerqueue head managing the list of events
- * @timer: hrtimer used to schedule events while running
* @gettime: Function to read the time correlating to the base
* @base_clockid: clockid for the base
*/