diff options
| author | Mark Brown <broonie@linaro.org> | 2013-11-20 15:20:24 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-11-20 15:20:24 +0000 |
| commit | 8b880f48eef80309da6d1c40f7526614b19ab12c (patch) | |
| tree | 1ae728f4e2c4020d62940e8cdae75a5352bc3ae1 /sound/soc/codecs/ab8500-codec.c | |
| parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
| parent | 63e6d43bf80d3861dcda7ff4f37590f8de583156 (diff) | |
| download | lwn-8b880f48eef80309da6d1c40f7526614b19ab12c.tar.gz lwn-8b880f48eef80309da6d1c40f7526614b19ab12c.zip | |
Merge remote-tracking branch 'asoc/fix/ab8500' into asoc-linus
Diffstat (limited to 'sound/soc/codecs/ab8500-codec.c')
| -rw-r--r-- | sound/soc/codecs/ab8500-codec.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index 80555d7551e6..79902179c657 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c @@ -2532,12 +2532,10 @@ static int ab8500_codec_probe(struct snd_soc_codec *codec) } /* Override HW-defaults */ - ab8500_codec_write_reg(codec, - AB8500_ANACONF5, - BIT(AB8500_ANACONF5_HSAUTOEN)); - ab8500_codec_write_reg(codec, - AB8500_SHORTCIRCONF, - BIT(AB8500_SHORTCIRCONF_HSZCDDIS)); + snd_soc_write(codec, AB8500_ANACONF5, + BIT(AB8500_ANACONF5_HSAUTOEN)); + snd_soc_write(codec, AB8500_SHORTCIRCONF, + BIT(AB8500_SHORTCIRCONF_HSZCDDIS)); /* Add filter controls */ status = snd_soc_add_codec_controls(codec, ab8500_filter_controls, @@ -2606,7 +2604,7 @@ static int ab8500_codec_driver_probe(struct platform_device *pdev) static int ab8500_codec_driver_remove(struct platform_device *pdev) { - dev_info(&pdev->dev, "%s Enter.\n", __func__); + dev_dbg(&pdev->dev, "%s Enter.\n", __func__); snd_soc_unregister_codec(&pdev->dev); |