Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1717794 > unrolled thread

[PATCH] ALSA: Fireface: Use common error handling code in pcm_open()

Started bySF Markus Elfring <elfring@users.sourceforge.net>
First post2017-08-22 22:00 +0200
Last post2017-08-23 16:00 +0200
Articles 5 — 3 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] ALSA: Fireface: Use common error handling code in pcm_open() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-22 22:00 +0200
    Re: [PATCH] ALSA: Fireface: Use common error handling code in  pcm_open() Takashi Sakamoto <o-takashi@sakamocchi.jp> - 2017-08-23 02:30 +0200
      [PATCH v2] ALSA: Fireface: Use common error handling code in  pcm_open() SF Markus Elfring <elfring@users.sourceforge.net> - 2017-08-23 15:00 +0200
        Re: [PATCH v2] ALSA: Fireface: Use common error handling code in  pcm_open() Takashi Sakamoto <o-takashi@sakamocchi.jp> - 2017-08-23 16:00 +0200
        Re: [PATCH v2] ALSA: Fireface: Use common error handling code in pcm_open() Takashi Iwai <tiwai@suse.de> - 2017-08-23 16:00 +0200

#1717794 — [PATCH] ALSA: Fireface: Use common error handling code in pcm_open()

FromSF Markus Elfring <elfring@users.sourceforge.net>
Date2017-08-22 22:00 +0200
Subject[PATCH] ALSA: Fireface: Use common error handling code in pcm_open()
Message-ID<uhnvb-6XU-13@gated-at.bofh.it>
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Tue, 22 Aug 2017 21:45:42 +0200

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 <elfring@users.sourceforge.net>
---
 sound/firewire/fireface/ff-pcm.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/sound/firewire/fireface/ff-pcm.c b/sound/firewire/fireface/ff-pcm.c
index d12a0e3a4219..40975395a64a 100644
--- a/sound/firewire/fireface/ff-pcm.c
+++ b/sound/firewire/fireface/ff-pcm.c
@@ -138,16 +138,12 @@ static int pcm_open(struct snd_pcm_substream *substream)
 		return err;
 
 	err = pcm_init_hw_params(ff, substream);
-	if (err < 0) {
-		snd_ff_stream_lock_release(ff);
-		return err;
-	}
+	if (err < 0)
+		goto release_lock;
 
 	err = ff->spec->protocol->get_clock(ff, &rate, &src);
-	if (err < 0) {
-		snd_ff_stream_lock_release(ff);
-		return err;
-	}
+	if (err < 0)
+		goto release_lock;
 
 	if (src != SND_FF_CLOCK_SRC_INTERNAL) {
 		for (i = 0; i < CIP_SFC_COUNT; ++i) {
@@ -177,6 +173,10 @@ static int pcm_open(struct snd_pcm_substream *substream)
 	snd_pcm_set_sync(substream);
 
 	return 0;
+
+release_lock:
+	snd_ff_stream_lock_release(ff);
+	return err;
 }
 
 static int pcm_close(struct snd_pcm_substream *substream)
-- 
2.14.0

[toc] | [next] | [standalone]

#1717910 — Re: [PATCH] ALSA: Fireface: Use common error handling code in pcm_open()

FromTakashi Sakamoto <o-takashi@sakamocchi.jp>
Date2017-08-23 02:30 +0200
SubjectRe: [PATCH] ALSA: Fireface: Use common error handling code in pcm_open()
Message-ID<uhrIu-1Ej-7@gated-at.bofh.it>
In reply to#1717794
Hi,

On Aug 23 2017 04:51, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Tue, 22 Aug 2017 21:45:42 +0200
> 
> 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 <elfring@users.sourceforge.net>
> ---
>   sound/firewire/fireface/ff-pcm.c | 16 ++++++++--------
>   1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/sound/firewire/fireface/ff-pcm.c b/sound/firewire/fireface/ff-pcm.c
> index d12a0e3a4219..40975395a64a 100644
> --- a/sound/firewire/fireface/ff-pcm.c
> +++ b/sound/firewire/fireface/ff-pcm.c
> @@ -138,16 +138,12 @@ static int pcm_open(struct snd_pcm_substream *substream)
>   		return err;
>   
>   	err = pcm_init_hw_params(ff, substream);
> -	if (err < 0) {
> -		snd_ff_stream_lock_release(ff);
> -		return err;
> -	}
> +	if (err < 0)
> +		goto release_lock;
>   
>   	err = ff->spec->protocol->get_clock(ff, &rate, &src);
> -	if (err < 0) {
> -		snd_ff_stream_lock_release(ff);
> -		return err;
> -	}
> +	if (err < 0)
> +		goto release_lock;
>   
>   	if (src != SND_FF_CLOCK_SRC_INTERNAL) {
>   		for (i = 0; i < CIP_SFC_COUNT; ++i) {
> @@ -177,6 +173,10 @@ static int pcm_open(struct snd_pcm_substream *substream)
>   	snd_pcm_set_sync(substream);
>   
>   	return 0;
> +
> +release_lock:
> +	snd_ff_stream_lock_release(ff);
> +	return err;
>   }
>   
>   static int pcm_close(struct snd_pcm_substream *substream)


A line to return for err is still left after applying this patch.

148         if (src != SND_FF_CLOCK_SRC_INTERNAL) {
149                 for (i = 0; i < CIP_SFC_COUNT; ++i) {
150                         if (amdtp_rate_table[i] == rate)
151                                 break;
152                 }
153                 /*
154                  * The unit is configured at sampling frequency 
which packet
155                  * streaming engine can't support.
156                  */
157                 if (i >= CIP_SFC_COUNT) {
158                         snd_ff_stream_lock_release(ff);
159                         return -EIO;
160                 }
161


Regards

Takashi Sakamoto

[toc] | [prev] | [next] | [standalone]

#1718335 — [PATCH v2] ALSA: Fireface: Use common error handling code in pcm_open()

FromSF Markus Elfring <elfring@users.sourceforge.net>
Date2017-08-23 15:00 +0200
Subject[PATCH v2] ALSA: Fireface: Use common error handling code in pcm_open()
Message-ID<uhDqi-DY-17@gated-at.bofh.it>
In reply to#1717910
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 23 Aug 2017 14:45:20 +0200

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 <elfring@users.sourceforge.net>
---

v2:
It seems that a source code adjustment was requested by Takashi Sakamoto
for another if branch.

 sound/firewire/fireface/ff-pcm.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/sound/firewire/fireface/ff-pcm.c b/sound/firewire/fireface/ff-pcm.c
index d12a0e3a4219..e3c16308363d 100644
--- a/sound/firewire/fireface/ff-pcm.c
+++ b/sound/firewire/fireface/ff-pcm.c
@@ -138,16 +138,12 @@ static int pcm_open(struct snd_pcm_substream *substream)
 		return err;
 
 	err = pcm_init_hw_params(ff, substream);
-	if (err < 0) {
-		snd_ff_stream_lock_release(ff);
-		return err;
-	}
+	if (err < 0)
+		goto release_lock;
 
 	err = ff->spec->protocol->get_clock(ff, &rate, &src);
-	if (err < 0) {
-		snd_ff_stream_lock_release(ff);
-		return err;
-	}
+	if (err < 0)
+		goto release_lock;
 
 	if (src != SND_FF_CLOCK_SRC_INTERNAL) {
 		for (i = 0; i < CIP_SFC_COUNT; ++i) {
@@ -159,8 +155,8 @@ static int pcm_open(struct snd_pcm_substream *substream)
 		 * streaming engine can't support.
 		 */
 		if (i >= CIP_SFC_COUNT) {
-			snd_ff_stream_lock_release(ff);
-			return -EIO;
+			err = -EIO;
+			goto release_lock;
 		}
 
 		substream->runtime->hw.rate_min = rate;
@@ -177,6 +173,10 @@ static int pcm_open(struct snd_pcm_substream *substream)
 	snd_pcm_set_sync(substream);
 
 	return 0;
+
+release_lock:
+	snd_ff_stream_lock_release(ff);
+	return err;
 }
 
 static int pcm_close(struct snd_pcm_substream *substream)
-- 
2.14.0

[toc] | [prev] | [next] | [standalone]

#1718370 — Re: [PATCH v2] ALSA: Fireface: Use common error handling code in pcm_open()

FromTakashi Sakamoto <o-takashi@sakamocchi.jp>
Date2017-08-23 16:00 +0200
SubjectRe: [PATCH v2] ALSA: Fireface: Use common error handling code in pcm_open()
Message-ID<uhEml-1ex-1@gated-at.bofh.it>
In reply to#1718335
On Aug 23 2017 21:54, SF Markus Elfring wrote:
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 23 Aug 2017 14:45:20 +0200
> 
> 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 <elfring@users.sourceforge.net>
> ---
> 
> v2:
> It seems that a source code adjustment was requested by Takashi Sakamoto
> for another if branch.
> 
>   sound/firewire/fireface/ff-pcm.c | 20 ++++++++++----------
>   1 file changed, 10 insertions(+), 10 deletions(-)

Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>

> diff --git a/sound/firewire/fireface/ff-pcm.c b/sound/firewire/fireface/ff-pcm.c
> index d12a0e3a4219..e3c16308363d 100644
> --- a/sound/firewire/fireface/ff-pcm.c
> +++ b/sound/firewire/fireface/ff-pcm.c
> @@ -138,16 +138,12 @@ static int pcm_open(struct snd_pcm_substream *substream)
>   		return err;
>   
>   	err = pcm_init_hw_params(ff, substream);
> -	if (err < 0) {
> -		snd_ff_stream_lock_release(ff);
> -		return err;
> -	}
> +	if (err < 0)
> +		goto release_lock;
>   
>   	err = ff->spec->protocol->get_clock(ff, &rate, &src);
> -	if (err < 0) {
> -		snd_ff_stream_lock_release(ff);
> -		return err;
> -	}
> +	if (err < 0)
> +		goto release_lock;
>   
>   	if (src != SND_FF_CLOCK_SRC_INTERNAL) {
>   		for (i = 0; i < CIP_SFC_COUNT; ++i) {
> @@ -159,8 +155,8 @@ static int pcm_open(struct snd_pcm_substream *substream)
>   		 * streaming engine can't support.
>   		 */
>   		if (i >= CIP_SFC_COUNT) {
> -			snd_ff_stream_lock_release(ff);
> -			return -EIO;
> +			err = -EIO;
> +			goto release_lock;
>   		}
>   
>   		substream->runtime->hw.rate_min = rate;
> @@ -177,6 +173,10 @@ static int pcm_open(struct snd_pcm_substream *substream)
>   	snd_pcm_set_sync(substream);
>   
>   	return 0;
> +
> +release_lock:
> +	snd_ff_stream_lock_release(ff);
> +	return err;
>   }
>   
>   static int pcm_close(struct snd_pcm_substream *substream)


Thanks

Takashi Sakamoto

[toc] | [prev] | [next] | [standalone]

#1718379 — Re: [PATCH v2] ALSA: Fireface: Use common error handling code in pcm_open()

FromTakashi Iwai <tiwai@suse.de>
Date2017-08-23 16:00 +0200
SubjectRe: [PATCH v2] ALSA: Fireface: Use common error handling code in pcm_open()
Message-ID<uhEmm-1ex-23@gated-at.bofh.it>
In reply to#1718335
On Wed, 23 Aug 2017 14:54:32 +0200,
SF Markus Elfring wrote:
> 
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 23 Aug 2017 14:45:20 +0200
> 
> 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 <elfring@users.sourceforge.net>
> ---
> 
> v2:
> It seems that a source code adjustment was requested by Takashi Sakamoto
> for another if branch.

Applied, thanks.


Takashi

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web