From: Feng Tang <feng.tang@intel.com>
To: Thomas Gleixner <tglx@linutronix.de>,
John Stultz <john.stultz@linaro.org>,
linux-kernel@vger.kernel.org
Cc: Feng Tang <feng.tang@intel.com>
Subject: [PATCH 2/2] time: remove the unnecessary CONFIG_GENERIC_CLOCKEVENS check
Date: Thu, 5 Jan 2012 21:28:05 +0800 [thread overview]
Message-ID: <1325770085-5162-2-git-send-email-feng.tang@intel.com> (raw)
In-Reply-To: <1325770085-5162-1-git-send-email-feng.tang@intel.com>
In kernel/time/Kconfig:
config GENERIC_CLOCKEVENTS_BUILD
bool
default y
depends on GENERIC_CLOCKEVENTS
So there is no need to check CONFIG_GENERIC_CLOCKEVENTS if the
CONFIG_GENERIC_CLOCKEVENTS_BUILD is defined already.
This prepares for the total removal of GENERIC_CLOCKEVENTS_BUILD.
Signed-off-by: Feng Tang <feng.tang@intel.com>
---
include/linux/clockchips.h | 4 ----
kernel/time/clockevents.c | 2 --
2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h
index 81e803e..ac15057 100644
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
@@ -155,11 +155,7 @@ clockevents_calc_mult_shift(struct clock_event_device *ce, u32 freq, u32 minsec)
freq, minsec);
}
-#ifdef CONFIG_GENERIC_CLOCKEVENTS
extern void clockevents_notify(unsigned long reason, void *arg);
-#else
-# define clockevents_notify(reason, arg) do { } while (0)
-#endif
#else /* CONFIG_GENERIC_CLOCKEVENTS_BUILD */
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index 1ecd6ba..f91b7a8 100644
--- a/kernel/time/clockevents.c
+++ b/kernel/time/clockevents.c
@@ -399,7 +399,6 @@ void clockevents_exchange_device(struct clock_event_device *old,
local_irq_restore(flags);
}
-#ifdef CONFIG_GENERIC_CLOCKEVENTS
/**
* clockevents_notify - notification about relevant events
*/
@@ -439,4 +438,3 @@ void clockevents_notify(unsigned long reason, void *arg)
raw_spin_unlock_irqrestore(&clockevents_lock, flags);
}
EXPORT_SYMBOL_GPL(clockevents_notify);
-#endif
--
1.7.1
next prev parent reply other threads:[~2012-01-05 5:13 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-05 13:28 [PATCH 1/2] time: remove the orphan option GENERIC_CLOCKEVENTS_MIGR Feng Tang
2012-01-05 13:28 ` Feng Tang [this message]
2012-01-05 11:17 ` [PATCH 2/2] time: remove the unnecessary CONFIG_GENERIC_CLOCKEVENS check Paul Bolle
2012-01-06 2:12 ` Feng Tang
2012-01-05 22:05 ` [PATCH 1/2] time: remove the orphan option GENERIC_CLOCKEVENTS_MIGR Paul Bolle
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=1325770085-5162-2-git-send-email-feng.tang@intel.com \
--to=feng.tang@intel.com \
--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
all inboxes | Powered by JetHome®