Merge remote-tracking branch 'asoc/topic/pcm1681' into asoc-next

7b1ad402 · Mark Brown · 44d62462 · a074ae0e · 7b1ad402 · 7b1ad402
Commit 7b1ad402 authored Jul 24, 2016 by Mark Brown
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

sound/soc/codecs/pcm1681.c sound/soc/codecs/pcm1681.c +1 -1

sound/soc/codecs/pcm179x.c sound/soc/codecs/pcm179x.c +1 -1

No files found.
--- 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);

--- 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;