All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: Mark Brown <broonie@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>,
	Liam Girdwood <lgirdwood@gmail.com>,
	Axel Lin <axel.lin@ingics.com>,
	alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org
Subject: [PATCH] ASoC: pcm1681/pcm1791: fix typo in declaration
Date: Mon, 13 Jun 2016 17:39:45 +0200	[thread overview]
Message-ID: <1465832422-2998958-4-git-send-email-arnd@arndb.de> (raw)
In-Reply-To: <1465832422-2998958-1-git-send-email-arnd@arndb.de>

gcc -Wextra warns about an obvious but harmless typo in the
pcm1681_writeable_reg function, which has an extra 'register
keyword', and in pcm179x, which has a second copy of that
declaration:

sound/soc/codecs/pcm1681.c:76:42: error: 'register' is not at beginning of declaration [-Werror=old-style-declaration]
sound/soc/codecs/pcm179x.c:62:42: error: 'register' is not at beginning of declaration [-Werror=old-style-declaration]

For consistency with the rest of the file, I'm changing this from
'unsigned register' to 'unsigned int', which has the same meaning
but causes no warning.

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

diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c
index 58325234285c..33e1fc2d1598 100644
--- a/sound/soc/codecs/pcm1681.c
+++ b/sound/soc/codecs/pcm1681.c
@@ -73,7 +73,7 @@ static bool pcm1681_accessible_reg(struct device *dev, unsigned int reg)
 	return !((reg == 0x00) || (reg == 0x0f));
 }
 
-static bool pcm1681_writeable_reg(struct device *dev, unsigned register reg)
+static bool pcm1681_writeable_reg(struct device *dev, unsigned int reg)
 {
 	return pcm1681_accessible_reg(dev, reg) &&
 		(reg != PCM1681_ZERO_DETECT_STATUS);
diff --git a/sound/soc/codecs/pcm179x.c b/sound/soc/codecs/pcm179x.c
index 06a66579ca6d..88fbdd184aa0 100644
--- a/sound/soc/codecs/pcm179x.c
+++ b/sound/soc/codecs/pcm179x.c
@@ -59,7 +59,7 @@ static bool pcm179x_accessible_reg(struct device *dev, unsigned int reg)
 	return reg >= 0x10 && reg <= 0x17;
 }
 
-static bool pcm179x_writeable_reg(struct device *dev, unsigned register reg)
+static bool pcm179x_writeable_reg(struct device *dev, unsigned int reg)
 {
 	bool accessible;
 
-- 
2.7.0

  parent reply	other threads:[~2016-06-13 15:40 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-13 15:39 [PATCH] ASoC: wm8985: add i2c dependency Arnd Bergmann
2016-06-13 15:39 ` [PATCH] ASoC: fix ABE_TWL6040 dependency Arnd Bergmann
2016-06-13 16:54   ` Applied "ASoC: fix ABE_TWL6040 dependency" to the asoc tree Mark Brown
2016-06-13 16:54     ` Mark Brown
2016-06-13 15:39 ` [PATCH] ASoC: cs53l30: include gpio/consumer.h Arnd Bergmann
2016-06-13 16:54   ` Applied "ASoC: cs53l30: include gpio/consumer.h" to the asoc tree Mark Brown
2016-06-13 16:54     ` Mark Brown
2016-06-13 15:39 ` Arnd Bergmann [this message]
2016-06-13 16:54   ` Applied "ASoC: pcm1681/pcm1791: fix typo in declaration" " Mark Brown
2016-06-13 16:54     ` Mark Brown
2016-06-13 15:39 ` [PATCH] ASoC: rcar: fix 'const static' variables Arnd Bergmann
2016-06-13 16:54   ` Applied "ASoC: rcar: fix 'const static' variables" to the asoc tree Mark Brown
2016-06-13 16:54     ` Mark Brown
2016-06-13 16:54 ` Applied "ASoC: wm8985: add i2c dependency" " Mark Brown
2016-06-13 16:54   ` Mark Brown

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=1465832422-2998958-4-git-send-email-arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=axel.lin@ingics.com \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.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 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.