diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-06-13 11:39:45 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-06-13 12:45:18 -0400 |
commit | a074ae0ed68385ee403e4247ce8274705fe9c4e0 (patch) | |
tree | 5ff92fa4d33f51950df589c304b06fe7e51d5f77 | |
parent | 1a695a905c18548062509178b98bc91e67510864 (diff) |
ASoC: pcm1681/pcm1791: fix typo in declaration
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>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/codecs/pcm1681.c | 2 | ||||
-rw-r--r-- | 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) | |||
73 | return !((reg == 0x00) || (reg == 0x0f)); | 73 | return !((reg == 0x00) || (reg == 0x0f)); |
74 | } | 74 | } |
75 | 75 | ||
76 | static bool pcm1681_writeable_reg(struct device *dev, unsigned register reg) | 76 | static bool pcm1681_writeable_reg(struct device *dev, unsigned int reg) |
77 | { | 77 | { |
78 | return pcm1681_accessible_reg(dev, reg) && | 78 | return pcm1681_accessible_reg(dev, reg) && |
79 | (reg != PCM1681_ZERO_DETECT_STATUS); | 79 | (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) | |||
59 | return reg >= 0x10 && reg <= 0x17; | 59 | return reg >= 0x10 && reg <= 0x17; |
60 | } | 60 | } |
61 | 61 | ||
62 | static bool pcm179x_writeable_reg(struct device *dev, unsigned register reg) | 62 | static bool pcm179x_writeable_reg(struct device *dev, unsigned int reg) |
63 | { | 63 | { |
64 | bool accessible; | 64 | bool accessible; |
65 | 65 | ||