linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ASoC: cs35l33: mark PM functions as __maybe_unused
@ 2016-06-29 14:33 Arnd Bergmann
  2016-06-29 14:48 ` Handrigan, Paul
  2016-06-29 18:04 ` Applied "ASoC: cs35l33: mark PM functions as __maybe_unused" to the asoc tree Mark Brown
  0 siblings, 2 replies; 4+ messages in thread
From: Arnd Bergmann @ 2016-06-29 14:33 UTC (permalink / raw)
  To: Mark Brown
  Cc: Arnd Bergmann, Brian Austin, Paul Handrigan, Liam Girdwood,
	Axel Lin, alsa-devel, linux-kernel

The newly added cs35l33 driver produces a harmless warning when
CONFIG_PM is disabled:

sound/soc/codecs/cs35l33.c:908:12: error: 'cs35l33_runtime_suspend' defined but not used [-Werror=unused-function]
sound/soc/codecs/cs35l33.c:868:12: error: 'cs35l33_runtime_resume' defined but not used [-Werror=unused-function]

This adds __maybe_unused annotations to shut up the warning
regardless of the configuration.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 sound/soc/codecs/cs35l33.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/cs35l33.c b/sound/soc/codecs/cs35l33.c
index 622a1111b21c..d8b5fc3fc45d 100644
--- a/sound/soc/codecs/cs35l33.c
+++ b/sound/soc/codecs/cs35l33.c
@@ -862,7 +862,7 @@ static const struct regmap_config cs35l33_regmap = {
 	.use_single_rw = true,
 };
 
-static int cs35l33_runtime_resume(struct device *dev)
+static int __maybe_unused cs35l33_runtime_resume(struct device *dev)
 {
 	struct cs35l33_private *cs35l33 = dev_get_drvdata(dev);
 	int ret;
@@ -902,7 +902,7 @@ err:
 	return ret;
 }
 
-static int cs35l33_runtime_suspend(struct device *dev)
+static int __maybe_unused cs35l33_runtime_suspend(struct device *dev)
 {
 	struct cs35l33_private *cs35l33 = dev_get_drvdata(dev);
 
-- 
2.9.0

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] ASoC: cs35l33: mark PM functions as __maybe_unused
  2016-06-29 14:33 [PATCH] ASoC: cs35l33: mark PM functions as __maybe_unused Arnd Bergmann
@ 2016-06-29 14:48 ` Handrigan, Paul
  2016-06-29 16:23   ` Mark Brown
  2016-06-29 18:04 ` Applied "ASoC: cs35l33: mark PM functions as __maybe_unused" to the asoc tree Mark Brown
  1 sibling, 1 reply; 4+ messages in thread
From: Handrigan, Paul @ 2016-06-29 14:48 UTC (permalink / raw)
  To: Arnd Bergmann, Mark Brown
  Cc: Austin, Brian, Liam Girdwood, Axel Lin, alsa-devel, linux-kernel



On 6/29/16, 9:33 AM, "Arnd Bergmann" <arnd@arndb.de> wrote:

>The newly added cs35l33 driver produces a harmless warning when
>CONFIG_PM is disabled:
>
>sound/soc/codecs/cs35l33.c:908:12: error: 'cs35l33_runtime_suspend'
>defined but not used [-Werror=unused-function]
>sound/soc/codecs/cs35l33.c:868:12: error: 'cs35l33_runtime_resume'
>defined but not used [-Werror=unused-function]
>
>This adds __maybe_unused annotations to shut up the warning
>regardless of the configuration.
>
>Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>---
> sound/soc/codecs/cs35l33.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/sound/soc/codecs/cs35l33.c b/sound/soc/codecs/cs35l33.c
>index 622a1111b21c..d8b5fc3fc45d 100644
>--- a/sound/soc/codecs/cs35l33.c
>+++ b/sound/soc/codecs/cs35l33.c
>@@ -862,7 +862,7 @@ static const struct regmap_config cs35l33_regmap = {
> 	.use_single_rw = true,
> };
> 
>-static int cs35l33_runtime_resume(struct device *dev)
>+static int __maybe_unused cs35l33_runtime_resume(struct device *dev)
> {
> 	struct cs35l33_private *cs35l33 = dev_get_drvdata(dev);
> 	int ret;
>@@ -902,7 +902,7 @@ err:
> 	return ret;
> }
> 
>-static int cs35l33_runtime_suspend(struct device *dev)
>+static int __maybe_unused cs35l33_runtime_suspend(struct device *dev)
> {
> 	struct cs35l33_private *cs35l33 = dev_get_drvdata(dev);
> 
>-- 
>2.9.0

Thanks!

Acked-by: Paul Handrigan <Paul.Handrigan@cirrus.com>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] ASoC: cs35l33: mark PM functions as __maybe_unused
  2016-06-29 14:48 ` Handrigan, Paul
@ 2016-06-29 16:23   ` Mark Brown
  0 siblings, 0 replies; 4+ messages in thread
From: Mark Brown @ 2016-06-29 16:23 UTC (permalink / raw)
  To: Handrigan, Paul
  Cc: Arnd Bergmann, Austin, Brian, Liam Girdwood, Axel Lin,
	alsa-devel, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 451 bytes --]

On Wed, Jun 29, 2016 at 02:48:15PM +0000, Handrigan, Paul wrote:
> On 6/29/16, 9:33 AM, "Arnd Bergmann" <arnd@arndb.de> wrote:

> > 
> >-- 
> >2.9.0

> Thanks!

> Acked-by: Paul Handrigan <Paul.Handrigan@cirrus.com>

Please delete unneeded context from mails when replying.  Doing this
makes it much easier to find your reply in the message, helping ensure
it won't be missed by people scrolling through the irrelevant quoted
material.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Applied "ASoC: cs35l33: mark PM functions as __maybe_unused" to the asoc tree
  2016-06-29 14:33 [PATCH] ASoC: cs35l33: mark PM functions as __maybe_unused Arnd Bergmann
  2016-06-29 14:48 ` Handrigan, Paul
@ 2016-06-29 18:04 ` Mark Brown
  1 sibling, 0 replies; 4+ messages in thread
From: Mark Brown @ 2016-06-29 18:04 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Paul Handrigan, Mark Brown, Mark Brown, Brian Austin, Axel Lin,
	linux-kernel, alsa-devel, Paul Handrigan, Liam Girdwood

The patch

   ASoC: cs35l33: mark PM functions as __maybe_unused

has been applied to the asoc tree at

   git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git 

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.  

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

>From 20f12f2c4819a36de92ec6be382d0636d3485c6b Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 29 Jun 2016 16:33:17 +0200
Subject: [PATCH] ASoC: cs35l33: mark PM functions as __maybe_unused

The newly added cs35l33 driver produces a harmless warning when
CONFIG_PM is disabled:

sound/soc/codecs/cs35l33.c:908:12: error: 'cs35l33_runtime_suspend' defined but not used [-Werror=unused-function]
sound/soc/codecs/cs35l33.c:868:12: error: 'cs35l33_runtime_resume' defined but not used [-Werror=unused-function]

This adds __maybe_unused annotations to shut up the warning
regardless of the configuration.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Paul Handrigan <Paul.Handrigan@cirrus.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
 sound/soc/codecs/cs35l33.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/cs35l33.c b/sound/soc/codecs/cs35l33.c
index 622a1111b21c..d8b5fc3fc45d 100644
--- a/sound/soc/codecs/cs35l33.c
+++ b/sound/soc/codecs/cs35l33.c
@@ -862,7 +862,7 @@ static const struct regmap_config cs35l33_regmap = {
 	.use_single_rw = true,
 };
 
-static int cs35l33_runtime_resume(struct device *dev)
+static int __maybe_unused cs35l33_runtime_resume(struct device *dev)
 {
 	struct cs35l33_private *cs35l33 = dev_get_drvdata(dev);
 	int ret;
@@ -902,7 +902,7 @@ err:
 	return ret;
 }
 
-static int cs35l33_runtime_suspend(struct device *dev)
+static int __maybe_unused cs35l33_runtime_suspend(struct device *dev)
 {
 	struct cs35l33_private *cs35l33 = dev_get_drvdata(dev);
 
-- 
2.8.1

^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2016-06-29 18:05 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-06-29 14:33 [PATCH] ASoC: cs35l33: mark PM functions as __maybe_unused Arnd Bergmann
2016-06-29 14:48 ` Handrigan, Paul
2016-06-29 16:23   ` Mark Brown
2016-06-29 18:04 ` Applied "ASoC: cs35l33: mark PM functions as __maybe_unused" to the asoc tree Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).