* [PATCH 0/1] coresight: next v5.5-rc6
@ 2020-01-17 18:56 Mathieu Poirier
2020-01-17 18:56 ` [PATCH 1/1] coresight: etm4x: Fix unused function warning Mathieu Poirier
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Mathieu Poirier @ 2020-01-17 18:56 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, linux-arm-kernel
Hi Greg,
Just a single patch to add for the next cycle.
Thanks,
Mathieu
Arnd Bergmann (1):
coresight: etm4x: Fix unused function warning
drivers/hwtracing/coresight/coresight-etm4x.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/1] coresight: etm4x: Fix unused function warning
2020-01-17 18:56 [PATCH 0/1] coresight: next v5.5-rc6 Mathieu Poirier
@ 2020-01-17 18:56 ` Mathieu Poirier
2020-01-17 23:14 ` [PATCH 0/1] coresight: next v5.5-rc6 Greg KH
2020-01-18 14:06 ` Greg KH
2 siblings, 0 replies; 4+ messages in thread
From: Mathieu Poirier @ 2020-01-17 18:56 UTC (permalink / raw)
To: gregkh; +Cc: linux-kernel, linux-arm-kernel
From: Arnd Bergmann <arnd@arndb•de>
Some of the newly added code in the etm4x driver is inside of an #ifdef,
and some other code is outside of it, leading to a harmless warning when
CONFIG_CPU_PM is disabled:
drivers/hwtracing/coresight/coresight-etm4x.c:68:13: error: 'etm4_os_lock' defined but not used [-Werror=unused-function]
static void etm4_os_lock(struct etmv4_drvdata *drvdata)
^~~~~~~~~~~~
To avoid the warning and simplify the the #ifdef checks, use
IS_ENABLED() instead, so the compiler can drop the unused functions
without complaining.
Fixes: f188b5e76aae ("coresight: etm4x: Save/restore state across CPU low power states")
Signed-off-by: Arnd Bergmann <arnd@arndb•de>
[Fixed capital 'f' in title]
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro•org>
---
drivers/hwtracing/coresight/coresight-etm4x.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c
index dc3f507e7562..a90d757f7043 100644
--- a/drivers/hwtracing/coresight/coresight-etm4x.c
+++ b/drivers/hwtracing/coresight/coresight-etm4x.c
@@ -1132,7 +1132,6 @@ static void etm4_init_trace_id(struct etmv4_drvdata *drvdata)
drvdata->trcid = coresight_get_trace_id(drvdata->cpu);
}
-#ifdef CONFIG_CPU_PM
static int etm4_cpu_save(struct etmv4_drvdata *drvdata)
{
int i, ret = 0;
@@ -1402,17 +1401,17 @@ static struct notifier_block etm4_cpu_pm_nb = {
static int etm4_cpu_pm_register(void)
{
- return cpu_pm_register_notifier(&etm4_cpu_pm_nb);
+ if (IS_ENABLED(CONFIG_CPU_PM))
+ return cpu_pm_register_notifier(&etm4_cpu_pm_nb);
+
+ return 0;
}
static void etm4_cpu_pm_unregister(void)
{
- cpu_pm_unregister_notifier(&etm4_cpu_pm_nb);
+ if (IS_ENABLED(CONFIG_CPU_PM))
+ cpu_pm_unregister_notifier(&etm4_cpu_pm_nb);
}
-#else
-static int etm4_cpu_pm_register(void) { return 0; }
-static void etm4_cpu_pm_unregister(void) { }
-#endif
static int etm4_probe(struct amba_device *adev, const struct amba_id *id)
{
--
2.20.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 0/1] coresight: next v5.5-rc6
2020-01-17 18:56 [PATCH 0/1] coresight: next v5.5-rc6 Mathieu Poirier
2020-01-17 18:56 ` [PATCH 1/1] coresight: etm4x: Fix unused function warning Mathieu Poirier
@ 2020-01-17 23:14 ` Greg KH
2020-01-18 14:06 ` Greg KH
2 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2020-01-17 23:14 UTC (permalink / raw)
To: Mathieu Poirier; +Cc: linux-kernel, linux-arm-kernel
On Fri, Jan 17, 2020 at 11:56:06AM -0700, Mathieu Poirier wrote:
> Hi Greg,
>
> Just a single patch to add for the next cycle.
Next cycle?
This doesn't apply to my char-misc-linus branch at all. But it does
apply to my -next branch which is for 5.6-rc1.
So which does this go to?
confused,
greg k-h
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 0/1] coresight: next v5.5-rc6
2020-01-17 18:56 [PATCH 0/1] coresight: next v5.5-rc6 Mathieu Poirier
2020-01-17 18:56 ` [PATCH 1/1] coresight: etm4x: Fix unused function warning Mathieu Poirier
2020-01-17 23:14 ` [PATCH 0/1] coresight: next v5.5-rc6 Greg KH
@ 2020-01-18 14:06 ` Greg KH
2 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2020-01-18 14:06 UTC (permalink / raw)
To: Mathieu Poirier; +Cc: linux-kernel, linux-arm-kernel
On Fri, Jan 17, 2020 at 11:56:06AM -0700, Mathieu Poirier wrote:
> Hi Greg,
>
> Just a single patch to add for the next cycle.
>
> Thanks,
> Mathieu
>
> Arnd Bergmann (1):
> coresight: etm4x: Fix unused function warning
>
> drivers/hwtracing/coresight/coresight-etm4x.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
I figured it out, this is already in my tree and scheduled to go to
Linus later today...
greg k-h
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-01-18 14:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-17 18:56 [PATCH 0/1] coresight: next v5.5-rc6 Mathieu Poirier
2020-01-17 18:56 ` [PATCH 1/1] coresight: etm4x: Fix unused function warning Mathieu Poirier
2020-01-17 23:14 ` [PATCH 0/1] coresight: next v5.5-rc6 Greg KH
2020-01-18 14:06 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox