All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] coresight: etm4x: fix unused function warning
@ 2019-12-10 20:33 ` Arnd Bergmann
  0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2019-12-10 20:33 UTC (permalink / raw)
  To: Mathieu Poirier, Alexander Shishkin
  Cc: Arnd Bergmann, Andrew Murray, Suzuki K Poulose,
	Greg Kroah-Hartman, Mike Leach, Sai Prakash Ranjan,
	linux-arm-kernel, linux-kernel

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>
---
 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.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH] coresight: etm4x: fix unused function warning
@ 2019-12-10 20:33 ` Arnd Bergmann
  0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2019-12-10 20:33 UTC (permalink / raw)
  To: Mathieu Poirier, Alexander Shishkin
  Cc: Sai Prakash Ranjan, Arnd Bergmann, Suzuki K Poulose,
	Greg Kroah-Hartman, linux-kernel, Andrew Murray,
	linux-arm-kernel, Mike Leach

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>
---
 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.0


_______________________________________________
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] coresight: etm4x: fix unused function warning
  2019-12-10 20:33 ` Arnd Bergmann
@ 2019-12-12 17:19   ` Mathieu Poirier
  -1 siblings, 0 replies; 4+ messages in thread
From: Mathieu Poirier @ 2019-12-12 17:19 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Alexander Shishkin, Andrew Murray, Suzuki K Poulose,
	Greg Kroah-Hartman, Mike Leach, Sai Prakash Ranjan,
	linux-arm-kernel, Linux Kernel Mailing List

On Tue, 10 Dec 2019 at 13:33, Arnd Bergmann <arnd@arndb.de> wrote:
>
> 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>
> ---
>  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

I have applied this.

Thanks,
Mathieu

>
>  static int etm4_probe(struct amba_device *adev, const struct amba_id *id)
>  {
> --
> 2.20.0
>

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH] coresight: etm4x: fix unused function warning
@ 2019-12-12 17:19   ` Mathieu Poirier
  0 siblings, 0 replies; 4+ messages in thread
From: Mathieu Poirier @ 2019-12-12 17:19 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Sai Prakash Ranjan, Suzuki K Poulose, Alexander Shishkin,
	Greg Kroah-Hartman, Linux Kernel Mailing List, Andrew Murray,
	linux-arm-kernel, Mike Leach

On Tue, 10 Dec 2019 at 13:33, Arnd Bergmann <arnd@arndb.de> wrote:
>
> 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>
> ---
>  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

I have applied this.

Thanks,
Mathieu

>
>  static int etm4_probe(struct amba_device *adev, const struct amba_id *id)
>  {
> --
> 2.20.0
>

_______________________________________________
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:[~2019-12-12 17:19 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-10 20:33 [PATCH] coresight: etm4x: fix unused function warning Arnd Bergmann
2019-12-10 20:33 ` Arnd Bergmann
2019-12-12 17:19 ` Mathieu Poirier
2019-12-12 17:19   ` Mathieu Poirier

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.