From: <gerg@snapgear.com>
To: linux-m68k@vger.kernel.org, uclinux-dev@uclinux.org
Cc: Greg Ungerer <gerg@uclinux.org>
Subject: [PATCH 3/5 v2] m68knommu: remove unused CONFIG_GENERIC_CMOS_UPDATE option
Date: Wed, 22 Feb 2012 13:58:54 +1000 [thread overview]
Message-ID: <1329883136-9837-3-git-send-email-gerg@snapgear.com> (raw)
In-Reply-To: <1329883136-9837-1-git-send-email-gerg@snapgear.com>
From: Greg Ungerer <gerg@uclinux.org>
The CONFIG_GENERIC_CMOS_UPDATE switch is always enabled for the non-MMU
m68k case. But the underlying code to support it, update_persistent_clock(),
doesn't end up doing anything on the currently supported non-MMU platforms.
No platforms supply the necessary function support for writing back the RTC.
So lets remove this option and support code. This also brings m68knommu
in line with the m68k, which doesn't enabled this switch either.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
---
arch/m68k/Kconfig | 3 ---
arch/m68k/kernel/time_no.c | 5 -----
2 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index ae413d4..6f823dc 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -24,9 +24,6 @@ config ARCH_HAS_ILOG2_U64
config GENERIC_CLOCKEVENTS
bool
-config GENERIC_CMOS_UPDATE
- def_bool !MMU
-
config GENERIC_GPIO
bool
diff --git a/arch/m68k/kernel/time_no.c b/arch/m68k/kernel/time_no.c
index 5fa42f1..87c7acd 100644
--- a/arch/m68k/kernel/time_no.c
+++ b/arch/m68k/kernel/time_no.c
@@ -65,11 +65,6 @@ void read_persistent_clock(struct timespec *ts)
}
}
-int update_persistent_clock(struct timespec now)
-{
- return set_rtc_mmss(now.tv_sec);
-}
-
void __init time_init(void)
{
mach_sched_init(timer_interrupt);
--
1.7.0.4
next prev parent reply other threads:[~2012-02-22 3:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-22 3:58 [PATCH 1/5 v2] m68knommu: make persistent clock code consistent with m68k gerg
2012-02-22 3:58 ` [PATCH 2/5 v2] m68knommu: modify timer init code to make it consistent with m68k code gerg
2012-02-22 3:58 ` gerg [this message]
2012-02-22 3:58 ` [PATCH 4/5 v2] m68k: merge mmu and non-mmu versions of time.c gerg
2012-02-22 9:42 ` Geert Uytterhoeven
2012-02-22 11:41 ` Greg Ungerer
2012-02-22 3:58 ` [PATCH 5/5 v2] m68k: remove dead timer code gerg
2012-02-22 10:05 ` Geert Uytterhoeven
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=1329883136-9837-3-git-send-email-gerg@snapgear.com \
--to=gerg@snapgear.com \
--cc=gerg@uclinux.org \
--cc=linux-m68k@vger.kernel.org \
--cc=uclinux-dev@uclinux.org \
/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