summaryrefslogtreecommitdiff
path: root/sound/soc
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2024-05-28 08:05:24 +0300
committerMark Brown <broonie@kernel.org>2024-06-03 17:59:35 +0300
commit33ae57277ce08b83c65c18a09bf09499de613c01 (patch)
treec75176dc62dd8f102956d9191c71acf77447be98 /sound/soc
parent72999a1b6663f1ff604e79aea54f168f78e2441a (diff)
downloadlinux-33ae57277ce08b83c65c18a09bf09499de613c01.tar.xz
ASoC: audio-graph-card2: remove ports node name check
Current audio-graph-card2 is checking if the node name was "ports" or not when parsing the property. if (of_node_name_eq(ports, "ports")) of_xxx(ports, ...); Now, it is using new port_to_ports() which will be NULL if the node doesn't have "ports", and each of_xxx functions will do nothing if node was NULL. Now we don't need to check ports node name. Let's remove and cleanup it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Link: https://msgid.link/r/877cfeh6gb.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/generic/audio-graph-card2.c15
-rw-r--r--sound/soc/generic/simple-card-utils.c3
2 files changed, 10 insertions, 8 deletions
diff --git a/sound/soc/generic/audio-graph-card2.c b/sound/soc/generic/audio-graph-card2.c
index 58123fbc2904..3029e8ebfa22 100644
--- a/sound/soc/generic/audio-graph-card2.c
+++ b/sound/soc/generic/audio-graph-card2.c
@@ -381,8 +381,7 @@ static void graph_parse_convert(struct device_node *ep,
struct device_node *ports = port_to_ports(port);
struct simple_util_data *adata = &props->adata;
- if (of_node_name_eq(ports, "ports"))
- simple_util_parse_convert(ports, NULL, adata);
+ simple_util_parse_convert(ports, NULL, adata);
simple_util_parse_convert(port, NULL, adata);
simple_util_parse_convert(ep, NULL, adata);
@@ -396,8 +395,7 @@ static void graph_parse_mclk_fs(struct device_node *ep,
struct device_node *port = ep_to_port(ep);
struct device_node *ports = port_to_ports(port);
- if (of_node_name_eq(ports, "ports"))
- of_property_read_u32(ports, "mclk-fs", &props->mclk_fs);
+ of_property_read_u32(ports, "mclk-fs", &props->mclk_fs);
of_property_read_u32(port, "mclk-fs", &props->mclk_fs);
of_property_read_u32(ep, "mclk-fs", &props->mclk_fs);
@@ -496,8 +494,7 @@ static int __graph_parse_node(struct simple_util_priv *priv,
struct device_node *rport = ep_to_port(ep);
struct device_node *rports = port_to_ports(rport);
- if (of_node_name_eq(rports, "ports"))
- snd_soc_of_parse_node_prefix(rports, cconf, codecs->of_node, "prefix");
+ snd_soc_of_parse_node_prefix(rports, cconf, codecs->of_node, "prefix");
snd_soc_of_parse_node_prefix(rport, cconf, codecs->of_node, "prefix");
of_node_put(rport);
@@ -717,6 +714,9 @@ static void graph_parse_daifmt(struct device_node *node,
{
unsigned int fmt;
+ if (!node)
+ return;
+
/*
* see also above "daifmt" explanation
* and samples.
@@ -798,8 +798,7 @@ static void graph_link_init(struct simple_util_priv *priv,
*/
graph_parse_daifmt(ep, &daifmt, &bit_frame); /* (C) */
graph_parse_daifmt(port, &daifmt, &bit_frame); /* (B) */
- if (of_node_name_eq(ports, "ports"))
- graph_parse_daifmt(ports, &daifmt, &bit_frame); /* (A) */
+ graph_parse_daifmt(ports, &daifmt, &bit_frame); /* (A) */
/*
* convert bit_frame
diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c
index bc4d518c35cb..a655f20428af 100644
--- a/sound/soc/generic/simple-card-utils.c
+++ b/sound/soc/generic/simple-card-utils.c
@@ -60,6 +60,9 @@ void simple_util_parse_convert(struct device_node *np,
{
char prop[128];
+ if (!np)
+ return;
+
if (!prefix)
prefix = "";