From: Chuansheng Liu <chuansheng.liu@intel.com>
To: john.stultz@linaro.org, tglx@linutronix.de, gregkh@linuxfoundation.org
Cc: linux-kernel@vger.kernel.org, chuansheng.liu@intel.com
Subject: [PATCH 3/3] alarmtimer: cleanup the POSIX clock interface without CONFIG_RTC_CLASS
Date: Thu, 01 Nov 2012 00:25:04 +0800 [thread overview]
Message-ID: <1351700704.15558.1575.camel@cliu38-desktop-build> (raw)
In-Reply-To: <1351700455.15558.1571.camel@cliu38-desktop-build>
When CONFIG_RTC_CLASS is not defined, implementing the POSIX clock
interface with null function is enough.
Signed-off-by: liu chuansheng <chuansheng.liu@intel.com>
---
kernel/time/alarmtimer.c | 78 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 59 insertions(+), 19 deletions(-)
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 5490fa8..12c17a4 100644
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -41,10 +41,6 @@ static struct alarm_base {
clockid_t base_clockid;
} alarm_bases[ALARM_NUMTYPE];
-/* freezer delta & lock used to handle clock_nanosleep triggered wakeups */
-static ktime_t freezer_delta;
-static DEFINE_SPINLOCK(freezer_delta_lock);
-
static struct wakeup_source *ws;
#ifdef CONFIG_RTC_CLASS
@@ -53,6 +49,10 @@ static struct rtc_timer rtctimer;
static struct rtc_device *rtcdev;
static DEFINE_MUTEX(rtcdev_mutex);
+/* freezer delta & lock used to handle clock_nanosleep triggered wakeups */
+static ktime_t freezer_delta;
+static DEFINE_SPINLOCK(freezer_delta_lock);
+
/**
* alarmtimer_get_rtcdev - Return selected rtcdevice
*
@@ -268,21 +268,6 @@ static int alarmtimer_suspend(struct device *dev)
}
#endif
-static void alarmtimer_freezerset(ktime_t absexp, enum alarmtimer_type type)
-{
- ktime_t delta;
- unsigned long flags;
- struct alarm_base *base = &alarm_bases[type];
-
- delta = ktime_sub(absexp, base->gettime());
-
- spin_lock_irqsave(&freezer_delta_lock, flags);
- if (!freezer_delta.tv64 || (delta.tv64 < freezer_delta.tv64))
- freezer_delta = delta;
- spin_unlock_irqrestore(&freezer_delta_lock, flags);
-}
-
-
/**
* alarm_init - Initialize an alarm structure
* @alarm: ptr to alarm to be initialized
@@ -393,6 +378,21 @@ u64 alarm_forward(struct alarm *alarm, ktime_t now, ktime_t interval)
+#ifdef CONFIG_RTC_CLASS
+static void alarmtimer_freezerset(ktime_t absexp, enum alarmtimer_type type)
+{
+ ktime_t delta;
+ unsigned long flags;
+ struct alarm_base *base = &alarm_bases[type];
+
+ delta = ktime_sub(absexp, base->gettime());
+
+ spin_lock_irqsave(&freezer_delta_lock, flags);
+ if (!freezer_delta.tv64 || (delta.tv64 < freezer_delta.tv64))
+ freezer_delta = delta;
+ spin_unlock_irqrestore(&freezer_delta_lock, flags);
+}
+
/**
* clock2alarm - helper that converts from clockid to alarmtypes
@@ -722,7 +722,47 @@ static int alarm_timer_nsleep(const clockid_t which_clock, int flags,
out:
return ret;
}
+#else
+static inline int alarm_clock_getres(const clockid_t which_clock,
+ struct timespec *tp)
+{
+ return 0;
+}
+
+static inline int alarm_clock_get(clockid_t which_clock, struct timespec *tp)
+{
+ return 0;
+}
+static inline int alarm_timer_create(struct k_itimer *new_timer)
+{
+ return 0;
+}
+
+static inline int alarm_timer_set(struct k_itimer *timr, int flags,
+ struct itimerspec *new_setting,
+ struct itimerspec *old_setting)
+{
+ return 0;
+}
+
+static inline int alarm_timer_del(struct k_itimer *timr)
+{
+ return 0;
+}
+
+static inline void alarm_timer_get(struct k_itimer *timr,
+ struct itimerspec *cur_setting)
+{
+ return;
+}
+
+static inline int alarm_timer_nsleep(const clockid_t which_clock, int flags,
+ struct timespec *tsreq, struct timespec __user *rmtp)
+{
+ return 0;
+}
+#endif
/* Suspend hook structures */
static const struct dev_pm_ops alarmtimer_pm_ops = {
--
1.7.0.4
prev parent reply other threads:[~2012-10-31 7:24 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-31 16:20 [PATCH 1/3] alarmtimer: Replace the spinlock rtcdev_lock with mutex Chuansheng Liu
2012-10-31 9:03 ` Oliver Neukum
2012-11-01 0:02 ` Liu, Chuansheng
2012-11-01 22:43 ` Thomas Gleixner
2012-11-02 3:32 ` Liu, Chuansheng
2012-10-31 16:23 ` [PATCH 2/3] alarmtimer: Using the alarmtimer_get_rtcdev for all posix clock interface Chuansheng Liu
2012-11-01 22:55 ` Thomas Gleixner
2012-11-02 3:41 ` Liu, Chuansheng
2012-11-02 6:10 ` Liu, Chuansheng
2012-10-31 16:25 ` Chuansheng Liu [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351700704.15558.1575.camel@cliu38-desktop-build \
--to=chuansheng.liu@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=john.stultz@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox