From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753201AbdHWFQa (ORCPT ); Wed, 23 Aug 2017 01:16:30 -0400 Received: from mx2.suse.de ([195.135.220.15]:40016 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751140AbdHWFQ3 (ORCPT ); Wed, 23 Aug 2017 01:16:29 -0400 Date: Wed, 23 Aug 2017 07:16:26 +0200 Message-ID: From: Takashi Iwai To: "SF Markus Elfring" Cc: , "Arnd Bergmann" , "Arvind Yadav" , "Ingo Molnar" , "Dan Carpenter" , "Vegard Nossum" , "Jaroslav Kysela" , "Takashi Sakamoto" , , "LKML" Subject: Re: [PATCH] ALSA: core: Use common error handling code in two functions In-Reply-To: References: User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.2 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 22 Aug 2017 21:12:02 +0200, SF Markus Elfring wrote: > > 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 Please don't mix the changes for both PCM and timer. Takashi > --- > 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 > >