From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750908AbdKSILq (ORCPT ); Sun, 19 Nov 2017 03:11:46 -0500 Received: from mout.web.de ([212.227.15.14]:57873 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750744AbdKSILn (ORCPT ); Sun, 19 Nov 2017 03:11:43 -0500 To: alsa-devel@alsa-project.org, Bhumika Goyal , Jaroslav Kysela , Kuninori Morimoto , Liam Girdwood , Mark Brown , Rob Herring , Takashi Iwai , Tony Lindgren From: SF Markus Elfring Subject: [PATCH] ASoC: audio-graph-scu-card: Use common error handling code in asoc_graph_card_parse_of() Cc: LKML , kernel-janitors@vger.kernel.org Message-ID: <3b978ab5-5a7f-369f-c663-938955a36e58@users.sourceforge.net> Date: Sun, 19 Nov 2017 09:09:38 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:Y4utEPSbAgKwIhoEKB5z97/lvIpvEBMUCa+0FcL/J8QeRJmeJHr nN0Ra6jr3trTOnyHOYYTZDm7QY2ecCHigrm0BfBVzFC4w0Q1NXeqBojSszr75M7oDdkWbmB rSycVk5NZlus3qsO/TsnRhWzvfIgCk1niOLr4PoSd1rY8tk1NhCxnKJ1W2ieUdiANKzFBr7 jc7ZE3m3TbWFjdIzHyZ1A== X-UI-Out-Filterresults: notjunk:1;V01:K0:5fcK0pFWlxs=:Ti/fE5JxJ9TR1CK1mQoEeK HlPZm8mlC4IvfV3peIy5xuzTOAYb+cvtKleWsg24wuHADubqwUk7BrLB50642tUw8SpZvtb4P sIcd6US1JssO9jO3lD0NV1n14WkvDGl6GVLZ6+FoRqp5tQZJ+7AJQkn3kBNkIbrHsT3hbnzoY 9nJSOIa4R9er5GS77W8vxXk33bU48ovPHlU61cUZYlvP/qRkEviqma1vlsyW44iY2sawYAiKz ciLflI1E4NpLdSHJmrZt7bQd/oHdwPw0Mmb54gKEwKiEhbOXyrEXLkGhUXfIzIc763kL9C1UW ChrnOXyNO4g8NPQwdeGKsh57XXDE6CoMBH0kfvxfhkcriBFWKGcN3QfnlSyP9+QiLpwTOHyLk mqSvmcdRaYoARxJzN9pGVl4rwbui10x0/oMREJXh7y5yirHBooTQ5YZP002WDPfFlx2QZqF50 ZGaLQ6WFF3WlUGmxoSTatLR7hpRjtA7vapKHVcFW1N/nTHoqmte30jTd8z1S8aVzuzYMKV6ys bRzbZGXRtMwqdirfK46yXKogn5Q/15qakYsdFPa4+glMVpVJKCQi7trT7Bv1CcjHJi//8OIRd jgE5y1Bq0UXwZJRMl7TRRuMEriR0gPVm5RICCBewiY7rpi27JEkadcBhs3WfW+dwtpSATPdoa /g3KoUcTWs2/oupCpoTAzp4Qe3b1DK6XQRZDQwDC/mM0iuVji7DqNAiQhWQ5dq7WiKg2aOokq 06BrJWWNNBFE4KqHUj13nIIxTJ57zpjp4QsmVm+fIGiG3cThZtPcNkkXH2dlT2RHxm0/0Gm9P LWCYJxu/G8Z2ThCRMRL4OeDaYJMNDeMW7Kpp6lwZDkC2IJeHMxTbSyavIdauF1NTq+CqDHB Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 19 Nov 2017 08:51:41 +0100 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- sound/soc/generic/audio-graph-scu-card.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/sound/soc/generic/audio-graph-scu-card.c b/sound/soc/generic/audio-graph-scu-card.c index a967aa143d51..c4b999fba7e6 100644 --- a/sound/soc/generic/audio-graph-scu-card.c +++ b/sound/soc/generic/audio-graph-scu-card.c @@ -231,10 +231,8 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) ret = asoc_simple_card_parse_daifmt(dev, cpu_ep, codec_ep, NULL, &daifmt); - if (ret < 0) { - of_node_put(cpu_port); - goto parse_of_err; - } + if (ret < 0) + goto put_node; } dai_idx = 0; @@ -266,17 +264,13 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) /* Back-End (= Codec) */ ret = asoc_graph_card_dai_link_of(codec_ep, priv, daifmt, dai_idx++, 0); - if (ret < 0) { - of_node_put(cpu_port); - goto parse_of_err; - } + if (ret < 0) + goto put_node; } else { /* Front-End (= CPU) */ ret = asoc_graph_card_dai_link_of(cpu_ep, priv, daifmt, dai_idx++, 1); - if (ret < 0) { - of_node_put(cpu_port); - goto parse_of_err; - } + if (ret < 0) + goto put_node; } } } @@ -285,8 +279,10 @@ static int asoc_graph_card_parse_of(struct graph_card_data *priv) if (ret) goto parse_of_err; - ret = 0; + return 0; +put_node: + of_node_put(cpu_port); parse_of_err: return ret; } -- 2.15.0