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

[platform/kernel/linux-rpi.git] / sound / soc / sh / rcar / core.c

diff --git a/sound/soc/sh/rcar/core.c b/sound/soc/sh/rcar/core.c
index e9596c2..fc32cbb 100644 (file)
--- a/sound/soc/sh/rcar/core.c
+++ b/sound/soc/sh/rcar/core.c
@@ -302,7 +302,7 @@ int rsnd_runtime_channel_after_ctu_with_params(struct rsnd_dai_stream *io,
 
 int rsnd_channel_normalization(int chan)
 {
-       if ((chan > 8) || (chan < 0))
+       if (WARN_ON((chan > 8) || (chan < 0)))
                return 0;
 
        /* TDM Extend Mode needs 8ch */
@@ -1076,7 +1076,10 @@ static void rsnd_parse_tdm_split_mode(struct rsnd_priv *priv,
                        j++;
                }
 
+               of_node_put(node);
        }
+
+       of_node_put(ssiu_np);
 }
 
 static void rsnd_parse_connect_simple(struct rsnd_priv *priv,
@@ -1094,11 +1097,13 @@ static void rsnd_parse_connect_graph(struct rsnd_priv *priv,
                                     struct device_node *endpoint)
 {
        struct device *dev = rsnd_priv_to_dev(priv);
-       struct device_node *remote_node = of_graph_get_remote_port_parent(endpoint);
+       struct device_node *remote_node;
 
        if (!rsnd_io_to_mod_ssi(io))
                return;
 
+       remote_node = of_graph_get_remote_port_parent(endpoint);
+
        /* HDMI0 */
        if (strstr(remote_node->full_name, "hdmi@fead0000")) {
                rsnd_flags_set(io, RSND_STREAM_HDMI0);
@@ -1112,6 +1117,8 @@ static void rsnd_parse_connect_graph(struct rsnd_priv *priv,
        }
 
        rsnd_parse_tdm_split_mode(priv, io, endpoint);
+
+       of_node_put(remote_node);
 }
 
 void rsnd_parse_connect_common(struct rsnd_dai *rdai,
@@ -1374,8 +1381,9 @@ static int rsnd_dai_probe(struct rsnd_priv *priv)
 /*
  *             pcm ops
  */
-static int rsnd_hw_params(struct snd_pcm_substream *substream,
-                        struct snd_pcm_hw_params *hw_params)
+static int rsnd_hw_params(struct snd_soc_component *component,
+                         struct snd_pcm_substream *substream,
+                         struct snd_pcm_hw_params *hw_params)
 {
        struct snd_soc_dai *dai = rsnd_substream_to_dai(substream);
        struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);
@@ -1422,7 +1430,8 @@ static int rsnd_hw_params(struct snd_pcm_substream *substream,
                                        params_buffer_bytes(hw_params));
 }
 
-static int rsnd_hw_free(struct snd_pcm_substream *substream)
+static int rsnd_hw_free(struct snd_soc_component *component,
+                       struct snd_pcm_substream *substream)
 {
        struct snd_soc_dai *dai = rsnd_substream_to_dai(substream);
        struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);
@@ -1436,7 +1445,8 @@ static int rsnd_hw_free(struct snd_pcm_substream *substream)
        return snd_pcm_lib_free_pages(substream);
 }
 
-static snd_pcm_uframes_t rsnd_pointer(struct snd_pcm_substream *substream)
+static snd_pcm_uframes_t rsnd_pointer(struct snd_soc_component *component,
+                                     struct snd_pcm_substream *substream)
 {
        struct snd_soc_dai *dai = rsnd_substream_to_dai(substream);
        struct rsnd_dai *rdai = rsnd_dai_to_rdai(dai);
@@ -1448,13 +1458,6 @@ static snd_pcm_uframes_t rsnd_pointer(struct snd_pcm_substream *substream)
        return pointer;
 }
 
-static const struct snd_pcm_ops rsnd_pcm_ops = {
-       .ioctl          = snd_pcm_lib_ioctl,
-       .hw_params      = rsnd_hw_params,
-       .hw_free        = rsnd_hw_free,
-       .pointer        = rsnd_pointer,
-};
-
 /*
  *             snd_kcontrol
  */
@@ -1648,8 +1651,11 @@ int rsnd_kctrl_new(struct rsnd_mod *mod,
  *             snd_soc_component
  */
 static const struct snd_soc_component_driver rsnd_soc_component = {
-       .ops            = &rsnd_pcm_ops,
        .name           = "rsnd",
+       .ioctl          = snd_soc_pcm_lib_ioctl,
+       .hw_params      = rsnd_hw_params,
+       .hw_free        = rsnd_hw_free,
+       .pointer        = rsnd_pointer,
 };
 
 static int rsnd_rdai_continuance_probe(struct rsnd_priv *priv,