* [PATCH] ALSA: Fireface: Use common error handling code in pcm_open()
@ 2017-08-22 19:51 SF Markus Elfring
2017-08-23 0:22 ` Takashi Sakamoto
0 siblings, 1 reply; 5+ messages in thread
From: SF Markus Elfring @ 2017-08-22 19:51 UTC (permalink / raw)
To: alsa-devel, Clemens Ladisch, Jaroslav Kysela, Takashi Iwai,
Takashi Sakamoto
Cc: kernel-janitors, LKML
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] ALSA: Fireface: Use common error handling code in pcm_open()
2017-08-22 19:51 [PATCH] ALSA: Fireface: Use common error handling code in pcm_open() SF Markus Elfring
@ 2017-08-23 0:22 ` Takashi Sakamoto
2017-08-23 12:54 ` [PATCH v2] " SF Markus Elfring
0 siblings, 1 reply; 5+ messages in thread
From: Takashi Sakamoto @ 2017-08-23 0:22 UTC (permalink / raw)
To: SF Markus Elfring, alsa-devel, Clemens Ladisch, Jaroslav Kysela,
Takashi Iwai
Cc: LKML, kernel-janitors
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
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH v2] ALSA: Fireface: Use common error handling code in pcm_open()
2017-08-23 0:22 ` Takashi Sakamoto
@ 2017-08-23 12:54 ` SF Markus Elfring
2017-08-23 13:50 ` Takashi Sakamoto
2017-08-23 13:52 ` Takashi Iwai
0 siblings, 2 replies; 5+ messages in thread
From: SF Markus Elfring @ 2017-08-23 12:54 UTC (permalink / raw)
To: alsa-devel, Clemens Ladisch, Jaroslav Kysela, Takashi Iwai,
Takashi Sakamoto
Cc: kernel-janitors, LKML
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
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2] ALSA: Fireface: Use common error handling code in pcm_open()
2017-08-23 12:54 ` [PATCH v2] " SF Markus Elfring
@ 2017-08-23 13:50 ` Takashi Sakamoto
2017-08-23 13:52 ` Takashi Iwai
1 sibling, 0 replies; 5+ messages in thread
From: Takashi Sakamoto @ 2017-08-23 13:50 UTC (permalink / raw)
To: SF Markus Elfring, alsa-devel, Clemens Ladisch, Jaroslav Kysela,
Takashi Iwai
Cc: LKML, kernel-janitors
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
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH v2] ALSA: Fireface: Use common error handling code in pcm_open()
2017-08-23 12:54 ` [PATCH v2] " SF Markus Elfring
2017-08-23 13:50 ` Takashi Sakamoto
@ 2017-08-23 13:52 ` Takashi Iwai
1 sibling, 0 replies; 5+ messages in thread
From: Takashi Iwai @ 2017-08-23 13:52 UTC (permalink / raw)
To: SF Markus Elfring
Cc: alsa-devel, Clemens Ladisch, Jaroslav Kysela, Takashi Sakamoto,
kernel-janitors, LKML
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-08-23 13:52 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-08-22 19:51 [PATCH] ALSA: Fireface: Use common error handling code in pcm_open() SF Markus Elfring
2017-08-23 0:22 ` Takashi Sakamoto
2017-08-23 12:54 ` [PATCH v2] " SF Markus Elfring
2017-08-23 13:50 ` Takashi Sakamoto
2017-08-23 13:52 ` Takashi Iwai
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox