ASoC: rsnd: no exception for SCU

R-Car Gen1 and Gen4 doesn't have SCU, and current driver checks Gen1
(only) on each devices (A). But these drivers are assuming it might be
not enabled after that (B).

	/* This driver doesn't support Gen1 at this point */
(A)	if (rsnd_is_gen1(priv))
		return 0;

(B)	node = rsnd_src_of_node(priv);
	if (!node)
		return 0; /* not used is not error */

Gen4 DT doesn't have these device settings. (A) check doesn't work for
it, but (B) check handling it.
Gen1 DT doesn't have these device settings either, and (A) is handling
it, but (B) only is very enough. (A) is no longer needed.

This patch removes (A)

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://msgid.link/r/87v850a4dl.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sh/rcar/cmd.c b/sound/soc/sh/rcar/cmd.c
index ec086d8e4d4435a342fe7fed6305d361bc1c14b2..8d9a1e345a22c3ff9ead02fba771d7702040d50a 100644 (file)
--- a/sound/soc/sh/rcar/cmd.c
+++ b/sound/soc/sh/rcar/cmd.c
@@ -157,10 +157,6 @@ int rsnd_cmd_probe(struct rsnd_priv *priv)
        struct rsnd_cmd *cmd;
        int i, nr;
 
-       /* This driver doesn't support Gen1 at this point */
-       if (rsnd_is_gen1(priv))
-               return 0;
-
        /* same number as DVC */
        nr = priv->dvc_nr;
        if (!nr)

diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c
index a35fc5ef87703e798e10942916a0ad96a39cc4f2..a26ec7b780cd6403324f3815a443738ae8e69f89 100644 (file)
--- a/sound/soc/sh/rcar/ctu.c
+++ b/sound/soc/sh/rcar/ctu.c
@@ -323,10 +323,6 @@ int rsnd_ctu_probe(struct rsnd_priv *priv)
        char name[CTU_NAME_SIZE];
        int i, nr, ret;
 
-       /* This driver doesn't support Gen1 at this point */
-       if (rsnd_is_gen1(priv))
-               return 0;
-
        node = rsnd_ctu_of_node(priv);
        if (!node)
                return 0; /* not used is not error */

diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c
index f349d6ab9fe5521f9e50805235a0fff4ac77757e..da91dd301aabeb649037228bfb73445532601aad 100644 (file)
--- a/sound/soc/sh/rcar/dvc.c
+++ b/sound/soc/sh/rcar/dvc.c
@@ -331,10 +331,6 @@ int rsnd_dvc_probe(struct rsnd_priv *priv)
        char name[RSND_DVC_NAME_SIZE];
        int i, nr, ret;
 
-       /* This driver doesn't support Gen1 at this point */
-       if (rsnd_is_gen1(priv))
-               return 0;
-
        node = rsnd_dvc_of_node(priv);
        if (!node)
                return 0; /* not used is not error */

diff --git a/sound/soc/sh/rcar/mix.c b/sound/soc/sh/rcar/mix.c
index e724103a2e8dec881c36a99872a38de89f85fbbf..024d91cc874840b0413abfc8b189e7e17c8b41cc 100644 (file)
--- a/sound/soc/sh/rcar/mix.c
+++ b/sound/soc/sh/rcar/mix.c
@@ -295,10 +295,6 @@ int rsnd_mix_probe(struct rsnd_priv *priv)
        char name[MIX_NAME_SIZE];
        int i, nr, ret;
 
-       /* This driver doesn't support Gen1 at this point */
-       if (rsnd_is_gen1(priv))
-               return 0;
-
        node = rsnd_mix_of_node(priv);
        if (!node)
                return 0; /* not used is not error */

diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c
index 431e6d195b096e1138e600d377c5957b6cc0c767..e7f86db0d94c3c21dfa23fcb46c523db20063750 100644 (file)
--- a/sound/soc/sh/rcar/src.c
+++ b/sound/soc/sh/rcar/src.c
@@ -652,10 +652,6 @@ int rsnd_src_probe(struct rsnd_priv *priv)
        char name[RSND_SRC_NAME_SIZE];
        int i, nr, ret;
 
-       /* This driver doesn't support Gen1 at this point */
-       if (rsnd_is_gen1(priv))
-               return 0;
-
        node = rsnd_src_of_node(priv);
        if (!node)
                return 0; /* not used is not error */