From: "tip-bot2 for Zhen Lei" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Zhen Lei <thunder.leizhen@huawei.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>, x86 <x86@kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: [tip: timers/core] clocksource/drivers/sp804: Remove unused sp804_timer_disable() and timer-sp804.h
Date: Sun, 27 Sep 2020 09:27:21 -0000 [thread overview]
Message-ID: <160119884197.7002.6152487091186524941.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20200918132237.3552-3-thunder.leizhen@huawei.com>
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 65f4d7ddc7b681001246f60c22a3cf650864da35
Gitweb: https://git.kernel.org/tip/65f4d7ddc7b681001246f60c22a3cf650864da35
Author: Zhen Lei <thunder.leizhen@huawei.com>
AuthorDate: Fri, 18 Sep 2020 21:22:30 +08:00
Committer: Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Thu, 24 Sep 2020 10:51:04 +02:00
clocksource/drivers/sp804: Remove unused sp804_timer_disable() and timer-sp804.h
Since commit 7484c727b636 ("ARM: realview: delete the RealView board
files") and commit 16956fed35fe ("ARM: versatile: switch to DT only
booting and remove legacy code"), there's no one to use the functions
defined or declared in include/clocksource/timer-sp804.h. Delete it.
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20200918132237.3552-3-thunder.leizhen@huawei.com
---
drivers/clocksource/timer-sp804.c | 7 -------
include/clocksource/timer-sp804.h | 29 -----------------------------
2 files changed, 36 deletions(-)
delete mode 100644 include/clocksource/timer-sp804.h
diff --git a/drivers/clocksource/timer-sp804.c b/drivers/clocksource/timer-sp804.c
index bec2d37..97b41a4 100644
--- a/drivers/clocksource/timer-sp804.c
+++ b/drivers/clocksource/timer-sp804.c
@@ -18,8 +18,6 @@
#include <linux/of_irq.h>
#include <linux/sched_clock.h>
-#include <clocksource/timer-sp804.h>
-
#include "timer-sp.h"
static long __init sp804_get_clock_rate(struct clk *clk, const char *name)
@@ -67,11 +65,6 @@ static u64 notrace sp804_read(void)
return ~readl_relaxed(sched_clock_base + TIMER_VALUE);
}
-void __init sp804_timer_disable(void __iomem *base)
-{
- writel(0, base + TIMER_CTRL);
-}
-
int __init __sp804_clocksource_and_sched_clock_init(void __iomem *base,
const char *name,
struct clk *clk,
diff --git a/include/clocksource/timer-sp804.h b/include/clocksource/timer-sp804.h
deleted file mode 100644
index a5b41f3..0000000
--- a/include/clocksource/timer-sp804.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __CLKSOURCE_TIMER_SP804_H
-#define __CLKSOURCE_TIMER_SP804_H
-
-struct clk;
-
-int __sp804_clocksource_and_sched_clock_init(void __iomem *,
- const char *, struct clk *, int);
-int __sp804_clockevents_init(void __iomem *, unsigned int,
- struct clk *, const char *);
-void sp804_timer_disable(void __iomem *);
-
-static inline void sp804_clocksource_init(void __iomem *base, const char *name)
-{
- __sp804_clocksource_and_sched_clock_init(base, name, NULL, 0);
-}
-
-static inline void sp804_clocksource_and_sched_clock_init(void __iomem *base,
- const char *name)
-{
- __sp804_clocksource_and_sched_clock_init(base, name, NULL, 1);
-}
-
-static inline void sp804_clockevents_init(void __iomem *base, unsigned int irq, const char *name)
-{
- __sp804_clockevents_init(base, irq, NULL, name);
-
-}
-#endif
next prev parent reply other threads:[~2020-09-27 9:27 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-18 13:22 [PATCH v3 0/9] clocksource: sp804: add support for Hisilicon sp804 timer Zhen Lei
2020-09-18 13:22 ` [PATCH v3 1/9] clocksource: sp804: cleanup clk_get_sys() Zhen Lei
2020-09-27 9:27 ` [tip: timers/core] clocksource/drivers/sp804: Cleanup clk_get_sys() tip-bot2 for Kefeng Wang
2020-09-18 13:22 ` [PATCH v3 2/9] clocksource: sp804: remove unused sp804_timer_disable() and timer-sp804.h Zhen Lei
2020-09-27 9:27 ` tip-bot2 for Zhen Lei [this message]
2020-09-18 13:22 ` [PATCH v3 3/9] clocksource: sp804: delete the leading "__" of some functions Zhen Lei
2020-09-27 9:27 ` [tip: timers/core] clocksource/drivers/sp804: Delete " tip-bot2 for Zhen Lei
2020-09-18 13:22 ` [PATCH v3 4/9] clocksource: sp804: remove a mismatched comment Zhen Lei
2020-09-27 9:27 ` [tip: timers/core] clocksource/drivers/sp804: Remove " tip-bot2 for Zhen Lei
2020-09-18 13:22 ` [PATCH v3 5/9] clocksource: sp804: prepare for support non-standard register offset Zhen Lei
2020-09-27 9:27 ` [tip: timers/core] clocksource/drivers/sp804: Prepare " tip-bot2 for Zhen Lei
2020-09-18 13:22 ` [PATCH v3 6/9] clocksource: sp804: " Zhen Lei
2020-09-27 9:27 ` [tip: timers/core] clocksource/drivers/sp804: Support " tip-bot2 for Zhen Lei
2020-09-18 13:22 ` [PATCH v3 7/9] clocksource: sp804: add support for Hisilicon sp804 timer Zhen Lei
2020-09-27 9:27 ` [tip: timers/core] clocksource/drivers/sp804: Add " tip-bot2 for Zhen Lei
2020-09-18 13:22 ` [PATCH v3 8/9] clocksource: sp804: enable Hisilicon sp804 timer 64bit mode Zhen Lei
2020-09-27 9:27 ` [tip: timers/core] clocksource/drivers/sp804: Enable " tip-bot2 for Zhen Lei
2020-09-18 13:22 ` [PATCH v3 9/9] dt-bindings: sp804: add support for Hisilicon sp804 timer Zhen Lei
2020-09-19 11:43 ` Daniel Lezcano
2020-09-19 12:36 ` Leizhen (ThunderTown)
2020-09-19 11:51 ` [PATCH v3 0/9] clocksource: " Daniel Lezcano
2020-09-19 12:19 ` Leizhen (ThunderTown)
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=160119884197.7002.6152487091186524941.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=daniel.lezcano@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=thunder.leizhen@huawei.com \
--cc=x86@kernel.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
all inboxes | Powered by JetHome®