From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752966AbdHVTNG (ORCPT ); Tue, 22 Aug 2017 15:13:06 -0400 Received: from mout.web.de ([212.227.15.4]:53898 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752359AbdHVTNE (ORCPT ); Tue, 22 Aug 2017 15:13:04 -0400 To: alsa-devel@alsa-project.org, Arnd Bergmann , Arvind Yadav , Dan Carpenter , Ingo Molnar , Jaroslav Kysela , Takashi Iwai , Takashi Sakamoto , Vegard Nossum From: SF Markus Elfring Subject: [PATCH] ALSA: core: Use common error handling code in two functions Cc: LKML , kernel-janitors@vger.kernel.org Message-ID: Date: Tue, 22 Aug 2017 21:12:02 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:6dTCj5MtGSpGCzxrr+M5MLECBrwMaF1CWC1dDH8t07sqyCImn0L mziM/e9TENarwZKfo4iNhLPWkgdef3wKukI81GN5lUqNRWVzLCF2ik7JNBLcaD90dvoDPXV b0PzaXPmcyMfgobNBHAO4AuNodElSIKeXY1e5eudiFSPhOIOWFDXoWhx+gkhWFoKqMO1nS2 ljsbPXIG5YDcIZWlsJ6pg== X-UI-Out-Filterresults: notjunk:1;V01:K0:/6Ox97Xzl5I=:3481e3BSEa5UhI9n3/FHwi fKrHQFmOg9RiEha34YvYiQzR8BtP3cMIWW0dBVZzANtyEx9SPBcL0ele5crz7utD9G2bcMaY2 ElVP3nebvhbziTe+skhTcSlTic2bOBJAU+vOEngjYb1bL0MM19VKpyrG6FRMbzf8OnaykxR5E YsOz9vqlqPbzQCm7QHA2cSwi3Q8eBRg99dTlWoVK33evjppqWZnTS3iKDM7oUzVrHQG704nGk nHYzDqjpSjBWgma4ypE/2jEcHTQK6M0cdkYptbNbUI9hNX3n6yQaJUam1KKJLo9UIvIRyCl2V 4OeBogDow4j55eMBBUNlsu5MyHRL/yIGmCMqXdPHI5CtsTYVaQX9sWTRGqry7gNVZzb4X3f1c EI43AZI0fVVIBwXU5sOFCjI1CnkE7hBkBROp7y75ZuaHDEhCvTkxBTbNT/Hubzlem08OgY/aX GexnJe0//mgoaBuUEPlSv+ClGeLXigsIZHxcacvq0uc819RsvDItAGjtos3CJ2Maml54LIUJj qpQzP5ZiB87YiiWMJWccjidCPgtWRUI2MxHiqywDF1DR3rOU0PtaGKTiGaXby+6GnioeSLiBj VRUoULeWLvBMU6bhwRvChOLORP+UlP2azIyT4ZIL9LEbJophuAYO983dXFkfoPgYYx076Qmq3 GRH8NrkpB/7rsRx7XARFQZQgEUgLWiggIQk9LN39y8YUNUJ0g/BQ8NuIixpQKF/v4Mk48+1BM MaVnAMvIRtNzHmCGkzZFGvThxWnNoVqXLTuY4N5BwpqKrY3yod8pNPWOpqjNe8EAnw4qYKgoj 4UA+l7qN/WXb9YBPYFYYwYI3nvD/rEDaSbvwPMYpBQjMX/he7q2oBL57w+vzwz25+a3twNM Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 22 Aug 2017 21:01:01 +0200 Add jump targets so that a bit of exception handling can be better reused at the end of these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- sound/core/pcm.c | 30 ++++++++++++++++++------------ sound/core/timer.c | 10 ++++++---- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 89c7485519cb..048df9658f50 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -783,21 +783,27 @@ static int _snd_pcm_new(struct snd_card *card, const char *id, int device, INIT_LIST_HEAD(&pcm->list); if (id) strlcpy(pcm->id, id, sizeof(pcm->id)); - if ((err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_PLAYBACK, playback_count)) < 0) { - snd_pcm_free(pcm); - return err; - } - if ((err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_CAPTURE, capture_count)) < 0) { - snd_pcm_free(pcm); - return err; - } - if ((err = snd_device_new(card, SNDRV_DEV_PCM, pcm, &ops)) < 0) { - snd_pcm_free(pcm); - return err; - } + + err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_PLAYBACK, + playback_count); + if (err < 0) + goto free_pcm; + + err = snd_pcm_new_stream(pcm, SNDRV_PCM_STREAM_CAPTURE, capture_count); + if (err < 0) + goto free_pcm; + + err = snd_device_new(card, SNDRV_DEV_PCM, pcm, &ops); + if (err < 0) + goto free_pcm; + if (rpcm) *rpcm = pcm; return 0; + +free_pcm: + snd_pcm_free(pcm); + return err; } /** diff --git a/sound/core/timer.c b/sound/core/timer.c index a9b9a277e00c..6d73a63f6e2b 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c @@ -2096,8 +2096,7 @@ static int __init alsa_timer_init(void) err = snd_timer_register_system(); if (err < 0) { pr_err("ALSA: unable to register system timer (%i)\n", err); - put_device(&timer_dev); - return err; + goto put_timer; } err = snd_register_device(SNDRV_DEVICE_TYPE_TIMER, NULL, 0, @@ -2105,12 +2104,15 @@ static int __init alsa_timer_init(void) if (err < 0) { pr_err("ALSA: unable to register timer device (%i)\n", err); snd_timer_free_all(); - put_device(&timer_dev); - return err; + goto put_timer; } snd_timer_proc_init(); return 0; + +put_timer: + put_device(&timer_dev); + return err; } static void __exit alsa_timer_exit(void) -- 2.14.0