From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753343AbdKWUHk (ORCPT ); Thu, 23 Nov 2017 15:07:40 -0500 Received: from mout.web.de ([212.227.15.4]:63368 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753286AbdKWUHi (ORCPT ); Thu, 23 Nov 2017 15:07:38 -0500 Subject: [PATCH 2/3] ASoC: da7218: Use common error handling code in da7218_of_to_pdata() From: SF Markus Elfring To: alsa-devel@alsa-project.org, support.opensource@diasemi.com, Adam Thomson , Jaroslav Kysela , Liam Girdwood , Mark Brown , Takashi Iwai Cc: LKML , kernel-janitors@vger.kernel.org References: <07c631e4-e2df-7ae2-ea31-9430c89dc8e3@users.sourceforge.net> Message-ID: <32a4c9e8-2030-c4e8-eb54-9ce6712ef0cd@users.sourceforge.net> Date: Thu, 23 Nov 2017 21:06:00 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <07c631e4-e2df-7ae2-ea31-9430c89dc8e3@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:ShFynOxFAVhSMIgA2/nHUhG6HP19ffVdx1ROWOIfhVQCqB5LVjt Qxw3GAEOpr/X3k1l6HVt+eG4tMNq+WPy2xEOHNHXT1vXnFG8QvGNJNBkhdAZqCHPE34RIPZ F12eoLT12n04cFjqUIQfnB56q3dzm+ryxnkiXWQHTlFMihTyzBEOZzQlI/Zc++ioxkvvzlO kImmTUR6V3EZihKrM1kaQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:QbOd0P0QTpY=:4yqZ8XuutXTZqYeGGmzREl qZP+HJL2ZIo/JnmGUZ4pcrqSaA/qxiirNf8Xp9j6i8c5U1aGTNhHOilD+CzyjPdgPJP0NxrY6 7jGfEIkn1w+pJ0jDF2U67xTIHfp7mBwriajs7CrNeAmEZ9oL8F5kgvXq+iyvZN3FmNJRwGbTg 6WUvg6OxemphcXsBKe2dedlrWIqMBvhVPZ8dD3AtLYyEjYFBgl7DcNGvJjs6iTygkO+xdut+k XZDmLLbOLXlm/BRy4rwSWLUsGlp+FrlpalwhhZMeXxDrWl21LtMdU9URS1UGGa7uixq+cZllw HC6uhD/H0vP9FrqpJsfmdZR0RokpQ/xB/rnlrvZ3Nb3Q1nOIl4cD3UCwKi/TOTfhl+4IQmbec x5qF4Pw83lyNUpHmgTU688K8PalFoKEj8kQG4BwonNs/JQhLR1H7Pz9LjEsICOhQSNkMyEUDK 66rirjJ3nhn4cBEaWtyLujwW+tEJfchHyyuApe4lGdA/mAA1u4cF6lEZpG7WssIAofns6hxLR PpXJyu74A4yF1Xeg4eSa+wDzZewlQyTknmZbywnpku0ZoW91ztM3bShvh9Qj+0mynRXUp3S4X IS6FaOhh2U1TCdxuDz22/MytIQ5mq6heIvt2jnH81zdMwfRL6kukLAhc6s3hSRKuPW6CuUmNi VaciU9gCY0pFT7iyhJWlTRokIxqLLcfBDIybBOLvjbWx9mcD5dD630SH0hlZBdBy8EeTBiQ2y f3u1fsnQsA8colf4Gr6XUq/of7WZCoqjEzoCc2Fpb7JtqAaYfOOdVz3iK70mrlxtIBbEq4kL3 1hlrvUSyXtnC8qtUAxVvexAyd07Ute2jd1VIbPDTrDT8uhaX3hI8XaQFr9dlAOpdnYUeZk0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 23 Nov 2017 20:48:05 +0100 Add a jump target so that a bit of exception handling can be better reused in an if branch of this function. Signed-off-by: Markus Elfring --- sound/soc/codecs/da7218.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c index 25ab7443d803..93a0cb741751 100644 --- a/sound/soc/codecs/da7218.c +++ b/sound/soc/codecs/da7218.c @@ -2524,10 +2524,9 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec) hpldet_pdata = devm_kzalloc(codec->dev, sizeof(*hpldet_pdata), GFP_KERNEL); - if (!hpldet_pdata) { - of_node_put(hpldet_np); - return pdata; - } + if (!hpldet_pdata) + goto put_node; + pdata->hpldet_pdata = hpldet_pdata; if (of_property_read_u32(hpldet_np, "dlg,jack-rate-us", @@ -2561,6 +2560,7 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec) if (of_property_read_bool(hpldet_np, "dlg,discharge")) hpldet_pdata->discharge = true; +put_node: of_node_put(hpldet_np); } -- 2.15.0