Merge remote-tracking branches 'asoc/topic/wm0010', 'asoc/topic/wm2000', 'asoc/topic...
authorMark Brown <broonie@kernel.org>
Thu, 18 Jan 2018 11:56:31 +0000 (11:56 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 18 Jan 2018 11:56:31 +0000 (11:56 +0000)
sound/soc/codecs/wm0010.c
sound/soc/codecs/wm2000.c
sound/soc/codecs/wm5102.c
sound/soc/codecs/wm5110.c
sound/soc/codecs/wm8350.c

index 4f5f5710b56941ddbee4e827bab1d16b79734a5e..0147d2fb7b0a28b389069616bfe8cdb2dc21f4e2 100644 (file)
@@ -655,11 +655,8 @@ static int wm0010_boot(struct snd_soc_codec *codec)
                ret = -ENOMEM;
                len = pll_rec.length + 8;
                out = kzalloc(len, GFP_KERNEL | GFP_DMA);
-               if (!out) {
-                       dev_err(codec->dev,
-                               "Failed to allocate RX buffer\n");
+               if (!out)
                        goto abort;
-               }
 
                img_swap = kzalloc(len, GFP_KERNEL | GFP_DMA);
                if (!img_swap)
index 23cde3a0dc112427cdc5eec64619eb32b43a4595..abfa052c07d83502800cbd84f8d0303ea18a9af8 100644 (file)
@@ -13,7 +13,7 @@
  * 'wm2000_anc.bin' by default (overridable via platform data) at
  * runtime and is expected to be in flat binary format.  This is
  * generated by Wolfson configuration tools and includes
- * system-specific callibration information.  If supplied as a
+ * system-specific calibration information.  If supplied as a
  * sequence of ASCII-encoded hexidecimal bytes this can be converted
  * into a flat binary with a command such as this on the command line:
  *
@@ -826,8 +826,7 @@ static int wm2000_i2c_probe(struct i2c_client *i2c,
        int reg;
        u16 id;
 
-       wm2000 = devm_kzalloc(&i2c->dev, sizeof(struct wm2000_priv),
-                             GFP_KERNEL);
+       wm2000 = devm_kzalloc(&i2c->dev, sizeof(*wm2000), GFP_KERNEL);
        if (!wm2000)
                return -ENOMEM;
 
@@ -902,7 +901,6 @@ static int wm2000_i2c_probe(struct i2c_client *i2c,
                                            wm2000->anc_download_size,
                                            GFP_KERNEL);
        if (wm2000->anc_download == NULL) {
-               dev_err(&i2c->dev, "Out of memory\n");
                ret = -ENOMEM;
                goto err_supplies;
        }
index 4f0481d3c7a7117894c209d217d403e1946d5393..fc066caa191884fa324c8813915edfcfcf5203d5 100644 (file)
@@ -1935,8 +1935,11 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec)
        struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
        struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
        struct wm5102_priv *priv = snd_soc_codec_get_drvdata(codec);
+       struct arizona *arizona = priv->core.arizona;
        int ret;
 
+       snd_soc_codec_init_regmap(codec, arizona->regmap);
+
        ret = wm_adsp2_codec_probe(&priv->core.adsp[0], codec);
        if (ret)
                return ret;
@@ -1989,17 +1992,9 @@ static unsigned int wm5102_digital_vu[] = {
        ARIZONA_DAC_DIGITAL_VOLUME_5R,
 };
 
-static struct regmap *wm5102_get_regmap(struct device *dev)
-{
-       struct wm5102_priv *priv = dev_get_drvdata(dev);
-
-       return priv->core.arizona->regmap;
-}
-
 static const struct snd_soc_codec_driver soc_codec_dev_wm5102 = {
        .probe = wm5102_codec_probe,
        .remove = wm5102_codec_remove,
-       .get_regmap = wm5102_get_regmap,
 
        .idle_bias_off = true,
 
index 6ed1e1f9ce516cb4867f51a0edb1e83e5ddf34a7..fb0cf9c61f48e8b4fc5af8aa1a1e9e3a0e580f95 100644 (file)
@@ -2280,9 +2280,11 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec)
        struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
        struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
        struct wm5110_priv *priv = snd_soc_codec_get_drvdata(codec);
+       struct arizona *arizona = priv->core.arizona;
        int i, ret;
 
-       priv->core.arizona->dapm = dapm;
+       arizona->dapm = dapm;
+       snd_soc_codec_init_regmap(codec, arizona->regmap);
 
        ret = arizona_init_spk(codec);
        if (ret < 0)
@@ -2344,17 +2346,9 @@ static unsigned int wm5110_digital_vu[] = {
        ARIZONA_DAC_DIGITAL_VOLUME_6R,
 };
 
-static struct regmap *wm5110_get_regmap(struct device *dev)
-{
-       struct wm5110_priv *priv = dev_get_drvdata(dev);
-
-       return priv->core.arizona->regmap;
-}
-
 static const struct snd_soc_codec_driver soc_codec_dev_wm5110 = {
        .probe = wm5110_codec_probe,
        .remove = wm5110_codec_remove,
-       .get_regmap = wm5110_get_regmap,
 
        .idle_bias_off = true,
 
index 2efc5b41ad0fe32f138384e91462af562e627a7d..fc79c6725d06f93f26efcb3eaf56eba70e872b6a 100644 (file)
@@ -1472,6 +1472,8 @@ static  int wm8350_codec_probe(struct snd_soc_codec *codec)
                            GFP_KERNEL);
        if (priv == NULL)
                return -ENOMEM;
+
+       snd_soc_codec_init_regmap(codec, wm8350->regmap);
        snd_soc_codec_set_drvdata(codec, priv);
 
        priv->wm8350 = wm8350;
@@ -1580,17 +1582,9 @@ static int  wm8350_codec_remove(struct snd_soc_codec *codec)
        return 0;
 }
 
-static struct regmap *wm8350_get_regmap(struct device *dev)
-{
-       struct wm8350 *wm8350 = dev_get_platdata(dev);
-
-       return wm8350->regmap;
-}
-
 static const struct snd_soc_codec_driver soc_codec_dev_wm8350 = {
        .probe =        wm8350_codec_probe,
        .remove =       wm8350_codec_remove,
-       .get_regmap =   wm8350_get_regmap,
        .set_bias_level = wm8350_set_bias_level,
        .suspend_bias_off = true,