mirror of
https://github.com/torvalds/linux.git
synced 2026-05-22 22:22:08 +02:00
ASoC: audio-graph-card2: use __free(device_node) for device node
audio-graph-card2 handles many type of device_node, thus need to use of_node_put() in many place. Let's use __free(device_node) and avoid it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Tested-by: Stephen Gordon <gordoste@iinet.net.au> Link: https://patch.msgid.link/87y0zoo5kc.wl-kuninori.morimoto.gx@renesas.com Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto
Mark Brown
parent
84eac6d478
commit
5f281c3e82
|
|
@ -333,8 +333,7 @@ static int graph_lnk_is_multi(struct device_node *lnk)
|
|||
|
||||
static struct device_node *graph_get_next_multi_ep(struct device_node **port)
|
||||
{
|
||||
struct device_node *ports = port_to_ports(*port);
|
||||
struct device_node *ep = NULL;
|
||||
struct device_node *ports __free(device_node) = port_to_ports(*port);
|
||||
struct device_node *rep = NULL;
|
||||
|
||||
/*
|
||||
|
|
@ -354,13 +353,11 @@ static struct device_node *graph_get_next_multi_ep(struct device_node **port)
|
|||
*/
|
||||
*port = of_graph_get_next_port(ports, *port);
|
||||
if (*port) {
|
||||
ep = of_graph_get_next_port_endpoint(*port, NULL);
|
||||
struct device_node *ep __free(device_node) = of_graph_get_next_port_endpoint(*port, NULL);
|
||||
|
||||
rep = of_graph_get_remote_endpoint(ep);
|
||||
}
|
||||
|
||||
of_node_put(ep);
|
||||
of_node_put(ports);
|
||||
|
||||
return rep;
|
||||
}
|
||||
|
||||
|
|
@ -373,16 +370,13 @@ static const struct snd_soc_ops graph_ops = {
|
|||
static void graph_parse_convert(struct device_node *ep,
|
||||
struct simple_dai_props *props)
|
||||
{
|
||||
struct device_node *port = ep_to_port(ep);
|
||||
struct device_node *ports = port_to_ports(port);
|
||||
struct device_node *port __free(device_node) = ep_to_port(ep);
|
||||
struct device_node *ports __free(device_node) = port_to_ports(port);
|
||||
struct simple_util_data *adata = &props->adata;
|
||||
|
||||
simple_util_parse_convert(ports, NULL, adata);
|
||||
simple_util_parse_convert(port, NULL, adata);
|
||||
simple_util_parse_convert(ep, NULL, adata);
|
||||
|
||||
of_node_put(port);
|
||||
of_node_put(ports);
|
||||
}
|
||||
|
||||
static int __graph_parse_node(struct simple_util_priv *priv,
|
||||
|
|
@ -471,14 +465,11 @@ static int __graph_parse_node(struct simple_util_priv *priv,
|
|||
if (!is_cpu && gtype == GRAPH_DPCM) {
|
||||
struct snd_soc_dai_link_component *codecs = snd_soc_link_to_codec(dai_link, idx);
|
||||
struct snd_soc_codec_conf *cconf = simple_props_to_codec_conf(dai_props, idx);
|
||||
struct device_node *rport = ep_to_port(ep);
|
||||
struct device_node *rports = port_to_ports(rport);
|
||||
struct device_node *rport __free(device_node) = ep_to_port(ep);
|
||||
struct device_node *rports __free(device_node) = port_to_ports(rport);
|
||||
|
||||
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);
|
||||
of_node_put(rports);
|
||||
}
|
||||
|
||||
if (is_cpu) {
|
||||
|
|
@ -526,25 +517,21 @@ static int graph_parse_node_multi_nm(struct snd_soc_dai_link *dai_link,
|
|||
* };
|
||||
* };
|
||||
*/
|
||||
struct device_node *mcpu_ep = of_graph_get_next_port_endpoint(mcpu_port, NULL);
|
||||
struct device_node *mcpu_ports = port_to_ports(mcpu_port);
|
||||
struct device_node *mcpu_port_top = of_graph_get_next_port(mcpu_ports, NULL);
|
||||
struct device_node *mcpu_ep_top = of_graph_get_next_port_endpoint(mcpu_port_top, NULL);
|
||||
struct device_node *mcodec_ep_top = of_graph_get_remote_endpoint(mcpu_ep_top);
|
||||
struct device_node *mcodec_port_top = ep_to_port(mcodec_ep_top);
|
||||
struct device_node *mcodec_ports = port_to_ports(mcodec_port_top);
|
||||
struct device_node *mcpu_ep __free(device_node) = of_graph_get_next_port_endpoint(mcpu_port, NULL);
|
||||
struct device_node *mcpu_ports __free(device_node) = port_to_ports(mcpu_port);
|
||||
struct device_node *mcpu_port_top __free(device_node) = of_graph_get_next_port(mcpu_ports, NULL);
|
||||
struct device_node *mcpu_ep_top __free(device_node) = of_graph_get_next_port_endpoint(mcpu_port_top, NULL);
|
||||
struct device_node *mcodec_ep_top __free(device_node) = of_graph_get_remote_endpoint(mcpu_ep_top);
|
||||
struct device_node *mcodec_port_top __free(device_node) = ep_to_port(mcodec_ep_top);
|
||||
struct device_node *mcodec_ports __free(device_node) = port_to_ports(mcodec_port_top);
|
||||
int nm_max = max(dai_link->num_cpus, dai_link->num_codecs);
|
||||
int ret = 0;
|
||||
|
||||
if (cpu_idx > dai_link->num_cpus) {
|
||||
ret = -EINVAL;
|
||||
goto mcpu_err;
|
||||
}
|
||||
if (cpu_idx > dai_link->num_cpus)
|
||||
return -EINVAL;
|
||||
|
||||
for_each_of_graph_port_endpoint(mcpu_port, mcpu_ep_n) {
|
||||
struct device_node *mcodec_ep_n;
|
||||
struct device_node *mcodec_port;
|
||||
int codec_idx;
|
||||
int codec_idx = 0;
|
||||
|
||||
/* ignore 1st ep which is for element */
|
||||
if (mcpu_ep_n == mcpu_ep)
|
||||
|
|
@ -553,16 +540,13 @@ static int graph_parse_node_multi_nm(struct snd_soc_dai_link *dai_link,
|
|||
if (*nm_idx > nm_max)
|
||||
break;
|
||||
|
||||
mcodec_ep_n = of_graph_get_remote_endpoint(mcpu_ep_n);
|
||||
mcodec_port = ep_to_port(mcodec_ep_n);
|
||||
struct device_node *mcodec_ep_n __free(device_node) = of_graph_get_remote_endpoint(mcpu_ep_n);
|
||||
struct device_node *mcodec_port __free(device_node) = ep_to_port(mcodec_ep_n);
|
||||
|
||||
if (mcodec_ports != port_to_ports(mcodec_port)) {
|
||||
ret = -EINVAL;
|
||||
goto mcpu_err;
|
||||
}
|
||||
|
||||
codec_idx = 0;
|
||||
ret = -EINVAL;
|
||||
if (mcodec_ports != port_to_ports(mcodec_port))
|
||||
break;
|
||||
|
||||
for_each_of_graph_port(mcodec_ports, mcodec_port_i) {
|
||||
|
||||
/* ignore 1st port which is for pair connection */
|
||||
|
|
@ -582,18 +566,9 @@ static int graph_parse_node_multi_nm(struct snd_soc_dai_link *dai_link,
|
|||
}
|
||||
codec_idx++;
|
||||
}
|
||||
of_node_put(mcodec_port);
|
||||
of_node_put(mcodec_ep_n);
|
||||
if (ret < 0)
|
||||
break;
|
||||
}
|
||||
mcpu_err:
|
||||
of_node_put(mcpu_ep);
|
||||
of_node_put(mcpu_port_top);
|
||||
of_node_put(mcpu_ep_top);
|
||||
of_node_put(mcodec_ep_top);
|
||||
of_node_put(mcodec_port_top);
|
||||
of_node_put(mcodec_ports);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -605,7 +580,6 @@ static int graph_parse_node_multi(struct simple_util_priv *priv,
|
|||
{
|
||||
struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link);
|
||||
struct device *dev = simple_priv_to_dev(priv);
|
||||
struct device_node *ep;
|
||||
int ret = -ENOMEM;
|
||||
int nm_idx = 0;
|
||||
int nm_max = max(dai_link->num_cpus, dai_link->num_codecs);
|
||||
|
|
@ -640,12 +614,11 @@ static int graph_parse_node_multi(struct simple_util_priv *priv,
|
|||
* };
|
||||
* };
|
||||
*/
|
||||
ep = graph_get_next_multi_ep(&port);
|
||||
struct device_node *ep __free(device_node) = graph_get_next_multi_ep(&port);
|
||||
if (!ep)
|
||||
break;
|
||||
|
||||
ret = __graph_parse_node(priv, gtype, ep, li, is_cpu, idx);
|
||||
of_node_put(ep);
|
||||
if (ret < 0)
|
||||
goto multi_err;
|
||||
|
||||
|
|
@ -669,12 +642,9 @@ static int graph_parse_node_single(struct simple_util_priv *priv,
|
|||
struct device_node *port,
|
||||
struct link_info *li, int is_cpu)
|
||||
{
|
||||
struct device_node *ep = of_graph_get_next_port_endpoint(port, NULL);
|
||||
int ret = __graph_parse_node(priv, gtype, ep, li, is_cpu, 0);
|
||||
struct device_node *ep __free(device_node) = of_graph_get_next_port_endpoint(port, NULL);
|
||||
|
||||
of_node_put(ep);
|
||||
|
||||
return ret;
|
||||
return __graph_parse_node(priv, gtype, ep, li, is_cpu, 0);
|
||||
}
|
||||
|
||||
static int graph_parse_node(struct simple_util_priv *priv,
|
||||
|
|
@ -751,7 +721,6 @@ static void graph_link_init(struct simple_util_priv *priv,
|
|||
struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link);
|
||||
struct simple_dai_props *dai_props = simple_priv_to_props(priv, li->link);
|
||||
struct device_node *ep_cpu, *ep_codec;
|
||||
struct device_node *ports_cpu, *ports_codec;
|
||||
unsigned int daifmt = 0, daiclk = 0;
|
||||
bool playback_only = 0, capture_only = 0;
|
||||
enum snd_soc_trigger_order trigger_start = SND_SOC_TRIGGER_ORDER_DEFAULT;
|
||||
|
|
@ -766,7 +735,7 @@ static void graph_link_init(struct simple_util_priv *priv,
|
|||
} else {
|
||||
ep_cpu = of_graph_get_next_port_endpoint(port_cpu, NULL);
|
||||
}
|
||||
ports_cpu = port_to_ports(port_cpu);
|
||||
struct device_node *ports_cpu __free(device_node) = port_to_ports(port_cpu);
|
||||
|
||||
of_node_get(port_codec);
|
||||
if (graph_lnk_is_multi(port_codec)) {
|
||||
|
|
@ -776,8 +745,7 @@ static void graph_link_init(struct simple_util_priv *priv,
|
|||
} else {
|
||||
ep_codec = of_graph_get_next_port_endpoint(port_codec, NULL);
|
||||
}
|
||||
ports_codec = port_to_ports(port_codec);
|
||||
|
||||
struct device_node *ports_codec __free(device_node) = port_to_ports(port_codec);
|
||||
|
||||
graph_parse_daifmt(ep_cpu, &daifmt, &bit_frame);
|
||||
graph_parse_daifmt(ep_codec, &daifmt, &bit_frame);
|
||||
|
|
@ -832,8 +800,6 @@ static void graph_link_init(struct simple_util_priv *priv,
|
|||
if (priv->ops)
|
||||
dai_link->ops = priv->ops;
|
||||
|
||||
of_node_put(ports_cpu);
|
||||
of_node_put(ports_codec);
|
||||
of_node_put(port_cpu);
|
||||
of_node_put(port_codec);
|
||||
of_node_put(ep_cpu);
|
||||
|
|
@ -845,8 +811,8 @@ int audio_graph2_link_normal(struct simple_util_priv *priv,
|
|||
struct link_info *li)
|
||||
{
|
||||
struct device_node *cpu_port = lnk;
|
||||
struct device_node *cpu_ep = of_graph_get_next_port_endpoint(cpu_port, NULL);
|
||||
struct device_node *codec_port = of_graph_get_remote_port(cpu_ep);
|
||||
struct device_node *cpu_ep __free(device_node) = of_graph_get_next_port_endpoint(cpu_port, NULL);
|
||||
struct device_node *codec_port __free(device_node) = of_graph_get_remote_port(cpu_ep);
|
||||
int ret;
|
||||
|
||||
/*
|
||||
|
|
@ -856,19 +822,16 @@ int audio_graph2_link_normal(struct simple_util_priv *priv,
|
|||
*/
|
||||
ret = graph_parse_node(priv, GRAPH_NORMAL, codec_port, li, 0);
|
||||
if (ret < 0)
|
||||
goto err;
|
||||
return ret;
|
||||
|
||||
/*
|
||||
* call CPU, and set DAI Name
|
||||
*/
|
||||
ret = graph_parse_node(priv, GRAPH_NORMAL, cpu_port, li, 1);
|
||||
if (ret < 0)
|
||||
goto err;
|
||||
return ret;
|
||||
|
||||
graph_link_init(priv, lnk, cpu_port, codec_port, li, 1);
|
||||
err:
|
||||
of_node_put(codec_port);
|
||||
of_node_put(cpu_ep);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -878,8 +841,8 @@ int audio_graph2_link_dpcm(struct simple_util_priv *priv,
|
|||
struct device_node *lnk,
|
||||
struct link_info *li)
|
||||
{
|
||||
struct device_node *ep = of_graph_get_next_port_endpoint(lnk, NULL);
|
||||
struct device_node *rep = of_graph_get_remote_endpoint(ep);
|
||||
struct device_node *ep __free(device_node) = of_graph_get_next_port_endpoint(lnk, NULL);
|
||||
struct device_node *rep __free(device_node) = of_graph_get_remote_endpoint(ep);
|
||||
struct device_node *cpu_port = NULL;
|
||||
struct device_node *codec_port = NULL;
|
||||
struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link);
|
||||
|
|
@ -963,8 +926,6 @@ int audio_graph2_link_dpcm(struct simple_util_priv *priv,
|
|||
|
||||
graph_link_init(priv, lnk, cpu_port, codec_port, li, is_cpu);
|
||||
err:
|
||||
of_node_put(ep);
|
||||
of_node_put(rep);
|
||||
of_node_put(cpu_port);
|
||||
of_node_put(codec_port);
|
||||
|
||||
|
|
@ -977,9 +938,9 @@ int audio_graph2_link_c2c(struct simple_util_priv *priv,
|
|||
struct link_info *li)
|
||||
{
|
||||
struct snd_soc_dai_link *dai_link = simple_priv_to_link(priv, li->link);
|
||||
struct device_node *port0, *port1, *ports;
|
||||
struct device_node *codec0_port, *codec1_port;
|
||||
struct device_node *ep0, *ep1;
|
||||
struct device_node *port0 = lnk;
|
||||
struct device_node *ports __free(device_node) = port_to_ports(port0);
|
||||
struct device_node *port1 __free(device_node) = of_graph_get_next_port(ports, port0);
|
||||
u32 val = 0;
|
||||
int ret = -EINVAL;
|
||||
|
||||
|
|
@ -999,10 +960,6 @@ int audio_graph2_link_c2c(struct simple_util_priv *priv,
|
|||
* };
|
||||
* };
|
||||
*/
|
||||
of_node_get(lnk);
|
||||
port0 = lnk;
|
||||
ports = port_to_ports(port0);
|
||||
port1 = of_graph_get_next_port(ports, port0);
|
||||
|
||||
/*
|
||||
* Card2 can use original Codec2Codec settings if DT has.
|
||||
|
|
@ -1019,7 +976,7 @@ int audio_graph2_link_c2c(struct simple_util_priv *priv,
|
|||
|
||||
c2c_conf = devm_kzalloc(dev, sizeof(*c2c_conf), GFP_KERNEL);
|
||||
if (!c2c_conf)
|
||||
goto err1;
|
||||
return ret;
|
||||
|
||||
c2c_conf->formats = SNDRV_PCM_FMTBIT_S32_LE; /* update ME */
|
||||
c2c_conf->rates = SNDRV_PCM_RATE_8000_384000;
|
||||
|
|
@ -1032,11 +989,11 @@ int audio_graph2_link_c2c(struct simple_util_priv *priv,
|
|||
dai_link->num_c2c_params = 1;
|
||||
}
|
||||
|
||||
ep0 = of_graph_get_next_port_endpoint(port0, NULL);
|
||||
ep1 = of_graph_get_next_port_endpoint(port1, NULL);
|
||||
struct device_node *ep0 __free(device_node) = of_graph_get_next_port_endpoint(port0, NULL);
|
||||
struct device_node *ep1 __free(device_node) = of_graph_get_next_port_endpoint(port1, NULL);
|
||||
|
||||
codec0_port = of_graph_get_remote_port(ep0);
|
||||
codec1_port = of_graph_get_remote_port(ep1);
|
||||
struct device_node *codec0_port __free(device_node) = of_graph_get_remote_port(ep0);
|
||||
struct device_node *codec1_port __free(device_node) = of_graph_get_remote_port(ep1);
|
||||
|
||||
/*
|
||||
* call Codec first.
|
||||
|
|
@ -1045,25 +1002,16 @@ int audio_graph2_link_c2c(struct simple_util_priv *priv,
|
|||
*/
|
||||
ret = graph_parse_node(priv, GRAPH_C2C, codec1_port, li, 0);
|
||||
if (ret < 0)
|
||||
goto err2;
|
||||
return ret;
|
||||
|
||||
/*
|
||||
* call CPU, and set DAI Name
|
||||
*/
|
||||
ret = graph_parse_node(priv, GRAPH_C2C, codec0_port, li, 1);
|
||||
if (ret < 0)
|
||||
goto err2;
|
||||
return ret;
|
||||
|
||||
graph_link_init(priv, lnk, codec0_port, codec1_port, li, 1);
|
||||
err2:
|
||||
of_node_put(ep0);
|
||||
of_node_put(ep1);
|
||||
of_node_put(codec0_port);
|
||||
of_node_put(codec1_port);
|
||||
err1:
|
||||
of_node_put(ports);
|
||||
of_node_put(port0);
|
||||
of_node_put(port1);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -1153,8 +1101,8 @@ static int graph_count_normal(struct simple_util_priv *priv,
|
|||
struct link_info *li)
|
||||
{
|
||||
struct device_node *cpu_port = lnk;
|
||||
struct device_node *cpu_ep = of_graph_get_next_port_endpoint(cpu_port, NULL);
|
||||
struct device_node *codec_port = of_graph_get_remote_port(cpu_ep);
|
||||
struct device_node *cpu_ep __free(device_node) = of_graph_get_next_port_endpoint(cpu_port, NULL);
|
||||
struct device_node *codec_port __free(device_node) = of_graph_get_remote_port(cpu_ep);
|
||||
|
||||
/*
|
||||
* CPU {
|
||||
|
|
@ -1171,9 +1119,6 @@ static int graph_count_normal(struct simple_util_priv *priv,
|
|||
|
||||
li->num[li->link].codecs = graph_counter(codec_port);
|
||||
|
||||
of_node_put(cpu_ep);
|
||||
of_node_put(codec_port);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1181,8 +1126,8 @@ static int graph_count_dpcm(struct simple_util_priv *priv,
|
|||
struct device_node *lnk,
|
||||
struct link_info *li)
|
||||
{
|
||||
struct device_node *ep = of_graph_get_next_port_endpoint(lnk, NULL);
|
||||
struct device_node *rport = of_graph_get_remote_port(ep);
|
||||
struct device_node *ep __free(device_node) = of_graph_get_next_port_endpoint(lnk, NULL);
|
||||
struct device_node *rport __free(device_node) = of_graph_get_remote_port(ep);
|
||||
|
||||
/*
|
||||
* dpcm {
|
||||
|
|
@ -1211,9 +1156,6 @@ static int graph_count_dpcm(struct simple_util_priv *priv,
|
|||
li->num[li->link].codecs = graph_counter(rport); /* BE */
|
||||
}
|
||||
|
||||
of_node_put(ep);
|
||||
of_node_put(rport);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -1221,13 +1163,13 @@ static int graph_count_c2c(struct simple_util_priv *priv,
|
|||
struct device_node *lnk,
|
||||
struct link_info *li)
|
||||
{
|
||||
struct device_node *ports = port_to_ports(lnk);
|
||||
struct device_node *port0 = lnk;
|
||||
struct device_node *port1 = of_graph_get_next_port(ports, of_node_get(port0));
|
||||
struct device_node *ep0 = of_graph_get_next_port_endpoint(port0, NULL);
|
||||
struct device_node *ep1 = of_graph_get_next_port_endpoint(port1, NULL);
|
||||
struct device_node *codec0 = of_graph_get_remote_port(ep0);
|
||||
struct device_node *codec1 = of_graph_get_remote_port(ep1);
|
||||
struct device_node *ports __free(device_node) = port_to_ports(lnk);
|
||||
struct device_node *port0 = of_node_get(lnk);
|
||||
struct device_node *port1 = of_node_get(of_graph_get_next_port(ports, of_node_get(port0)));
|
||||
struct device_node *ep0 __free(device_node) = of_graph_get_next_port_endpoint(port0, NULL);
|
||||
struct device_node *ep1 __free(device_node) = of_graph_get_next_port_endpoint(port1, NULL);
|
||||
struct device_node *codec0 __free(device_node) = of_graph_get_remote_port(ep0);
|
||||
struct device_node *codec1 __free(device_node) = of_graph_get_remote_port(ep1);
|
||||
|
||||
/*
|
||||
* codec2codec {
|
||||
|
|
@ -1247,13 +1189,6 @@ static int graph_count_c2c(struct simple_util_priv *priv,
|
|||
|
||||
li->num[li->link].codecs = graph_counter(codec1);
|
||||
|
||||
of_node_put(ports);
|
||||
of_node_put(port1);
|
||||
of_node_put(ep0);
|
||||
of_node_put(ep1);
|
||||
of_node_put(codec0);
|
||||
of_node_put(codec1);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user