Merge branch 'for-4.20' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[linux-2.6-block.git] / sound / soc / sh / rcar / dvc.c

diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
index 17eff3e60bbea5634452f385b503b79e67dec62b..8d91c0eb0880f17eb627bb946934b158fa3fd033 100644 (file)
--- a/sound/soc/sh/rcar/dvc.c
+++ b/sound/soc/sh/rcar/dvc.c
@@ -40,11 +40,8 @@ struct rsnd_dvc {
        struct rsnd_kctrl_cfg_s ren;    /* Ramp Enable */
        struct rsnd_kctrl_cfg_s rup;    /* Ramp Rate Up */
        struct rsnd_kctrl_cfg_s rdown;  /* Ramp Rate Down */
-       u32 flags;
 };
 
-#define KCTRL_INITIALIZED      (1 << 0)
-
 #define rsnd_dvc_get(priv, id) ((struct rsnd_dvc *)(priv->dvc) + id)
 #define rsnd_dvc_nr(priv) ((priv)->dvc_nr)
 
@@ -221,9 +218,6 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
        int channels = rsnd_rdai_channels_get(rdai);
        int ret;
 
-       if (rsnd_flags_has(dvc, KCTRL_INITIALIZED))
-               return 0;
-
        /* Volume */
        ret = rsnd_kctrl_new_m(mod, io, rtd,
                        is_play ?
@@ -279,8 +273,6 @@ static int rsnd_dvc_pcm_new(struct rsnd_mod *mod,
        if (ret < 0)
                return ret;
 
-       rsnd_flags_set(dvc, KCTRL_INITIALIZED);
-
        return 0;
 }