[tip:timers/core] arm64/arch_timer: Mark errata handlers as __maybe_unused

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	tip-bot for Arnd Bergmann <tipbot@zytor.com>
Newsgroups	linux.kernel
Subject	[tip:timers/core] arm64/arch_timer: Mark errata handlers as __maybe_unused
Date	Thu, 20 Apr 2017 15:20:01 +0200
Message-ID	<tyka5-XM-5@gated-at.bofh.it> (permalink)
References	<ty1K9-6hB-13@gated-at.bofh.it>
Reply-To	linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com, will.deacon@arm.com, daniel.lezcano@linaro.org, mark.rutland@arm.com, marc.zyngier@arm.com, arnd@arndb.de, tglx@linutronix.de, christoffer.dall@linaro.org
Git-Commit-ID	eb64522100a1d4adc89bce11b935a30c4401e234
X-Mailer	tip-git-log-daemon
Robot-ID	<tip-bot.git.kernel.org>
Robot-Unsubscribe	Contact <mailto:hpa@kernel.org> to get blacklisted from these emails
MIME-Version	1.0
Content-Transfer-Encoding	8bit
Content-Type	text/plain; charset=UTF-8
Content-Disposition	inline
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	58
Organization	linux.* mail to news gateway
X-Original-Cc	mingo@kernel.org, linux-kernel@vger.kernel.org, will.deacon@arm.com, hpa@zytor.com, daniel.lezcano@linaro.org, marc.zyngier@arm.com, mark.rutland@arm.com, arnd@arndb.de, tglx@linutronix.de, christoffer.dall@linaro.org
X-Original-Date	Thu, 20 Apr 2017 06:14:28 -0700
X-Original-Message-ID	<tip-eb64522100a1d4adc89bce11b935a30c4401e234@git.kernel.org>
X-Original-References	<20170419173737.3846098-1-arnd@arndb.de>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1627431

Show key headers only | View raw

Commit-ID:  eb64522100a1d4adc89bce11b935a30c4401e234
Gitweb:     http://git.kernel.org/tip/eb64522100a1d4adc89bce11b935a30c4401e234
Author:     Arnd Bergmann <arnd@arndb.de>
AuthorDate: Wed, 19 Apr 2017 19:37:09 +0200
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Thu, 20 Apr 2017 14:56:59 +0200

arm64/arch_timer: Mark errata handlers as __maybe_unused

In some rare randconfig builds, we end up with two functions being entirely
unused:

drivers/clocksource/arm_arch_timer.c:342:12: error: 'erratum_set_next_event_tval_phys' defined but not used [-Werror=unused-function]
 static int erratum_set_next_event_tval_phys(unsigned long evt,
drivers/clocksource/arm_arch_timer.c:335:12: error: 'erratum_set_next_event_tval_virt' defined but not used [-Werror=unused-function]
 static int erratum_set_next_event_tval_virt(unsigned long evt,

We could add an #ifdef around them, but we would already have to check for
several symbols there and there is a chance this would get more complicated
over time, so marking them as __maybe_unused is the simplest way to avoid the
harmless warnings.

Fixes: 01d3e3ff2608 ("arm64: arch_timer: Rework the set_next_event workarounds")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Christoffer Dall <christoffer.dall@linaro.org>
Link: http://lkml.kernel.org/r/20170419173737.3846098-1-arnd@arndb.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

---
 drivers/clocksource/arm_arch_timer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c
index 2208fa4..a1fb918 100644
--- a/drivers/clocksource/arm_arch_timer.c
+++ b/drivers/clocksource/arm_arch_timer.c
@@ -324,14 +324,14 @@ static void erratum_set_next_event_tval_generic(const int access, unsigned long
 	arch_timer_reg_write(access, ARCH_TIMER_REG_CTRL, ctrl, clk);
 }
 
-static int erratum_set_next_event_tval_virt(unsigned long evt,
+static __maybe_unused int erratum_set_next_event_tval_virt(unsigned long evt,
 					    struct clock_event_device *clk)
 {
 	erratum_set_next_event_tval_generic(ARCH_TIMER_VIRT_ACCESS, evt, clk);
 	return 0;
 }
 
-static int erratum_set_next_event_tval_phys(unsigned long evt,
+static __maybe_unused int erratum_set_next_event_tval_phys(unsigned long evt,
 					    struct clock_event_device *clk)
 {
 	erratum_set_next_event_tval_generic(ARCH_TIMER_PHYS_ACCESS, evt, clk);

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH] arm64: arch_timer: mark errata handlers as __maybe_unused Arnd Bergmann <arnd@arndb.de> - 2017-04-19 19:40 +0200
  Re: [PATCH] arm64: arch_timer: mark errata handlers as __maybe_unused Marc Zyngier <marc.zyngier@arm.com> - 2017-04-19 20:10 +0200
  Re: [PATCH] arm64: arch_timer: mark errata handlers as __maybe_unused Daniel Lezcano <daniel.lezcano@linaro.org> - 2017-04-19 20:20 +0200
  [tip:timers/core] arm64/arch_timer: Mark errata handlers as  __maybe_unused tip-bot for Arnd Bergmann <tipbot@zytor.com> - 2017-04-20 15:20 +0200

csiph-web