Merge remote-tracking branch 'sound-asoc/for-next'

[deliverable/linux.git] / sound / soc / codecs / pcm1681.c

diff --git a/sound/soc/codecs/pcm1681.c b/sound/soc/codecs/pcm1681.c
index 58325234285c779c8c566486383dda6267795dec..0b14efab6280dd88b7a72c7df84fb3625a15f650 100644 (file)
--- 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);
@@ -289,12 +289,14 @@ static const struct regmap_config pcm1681_regmap = {
 };
 
 static struct snd_soc_codec_driver soc_codec_dev_pcm1681 = {
-       .controls               = pcm1681_controls,
-       .num_controls           = ARRAY_SIZE(pcm1681_controls),
-       .dapm_widgets           = pcm1681_dapm_widgets,
-       .num_dapm_widgets       = ARRAY_SIZE(pcm1681_dapm_widgets),
-       .dapm_routes            = pcm1681_dapm_routes,
-       .num_dapm_routes        = ARRAY_SIZE(pcm1681_dapm_routes),
+       .component_driver = {
+               .controls               = pcm1681_controls,
+               .num_controls           = ARRAY_SIZE(pcm1681_controls),
+               .dapm_widgets           = pcm1681_dapm_widgets,
+               .num_dapm_widgets       = ARRAY_SIZE(pcm1681_dapm_widgets),
+               .dapm_routes            = pcm1681_dapm_routes,
+               .num_dapm_routes        = ARRAY_SIZE(pcm1681_dapm_routes),
+       },
 };
 
 static const struct i2c_device_id pcm1681_i2c_id[] = {