diff mbox

[1/1] ALSA: es1688_lib: Deletion of an unnecessary check before the function call "release_and_free_resource"

Message ID 546F8063.3090002@users.sourceforge.net (mailing list archive)
State Accepted
Commit 42d772101274492ca15258ea346e6ebbc2bc9bd0
Headers show

Commit Message

SF Markus Elfring Nov. 21, 2014, 6:11 p.m. UTC 
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Fri, 21 Nov 2014 19:05:50 +0100

The release_and_free_resource() function tests whether its argument is NULL
and then returns immediately. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 sound/isa/es1688/es1688_lib.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Takashi Iwai Nov. 21, 2014, 7:08 p.m. UTC | #1 
At Fri, 21 Nov 2014 19:11:47 +0100,
SF Markus Elfring wrote:
> 
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Fri, 21 Nov 2014 19:05:50 +0100
> 
> The release_and_free_resource() function tests whether its argument is NULL
> and then returns immediately. Thus the test around the call is not needed.
> 
> This issue was detected by using the Coccinelle software.
> 
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>

Applied, thanks.


Takashi

> ---
>  sound/isa/es1688/es1688_lib.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
> index b3b4f15..fb259491 100644
> --- a/sound/isa/es1688/es1688_lib.c
> +++ b/sound/isa/es1688/es1688_lib.c
> @@ -614,8 +614,7 @@ static int snd_es1688_free(struct snd_es1688 *chip)
>  {
>  	if (chip->hardware != ES1688_HW_UNDEF)
>  		snd_es1688_init(chip, 0);
> -	if (chip->res_port)
> -		release_and_free_resource(chip->res_port);
> +	release_and_free_resource(chip->res_port);
>  	if (chip->irq >= 0)
>  		free_irq(chip->irq, (void *) chip);
>  	if (chip->dma8 >= 0) {
> -- 
> 2.1.3
>
diff mbox

Patch

diff --git a/sound/isa/es1688/es1688_lib.c b/sound/isa/es1688/es1688_lib.c
index b3b4f15..fb259491 100644
--- a/sound/isa/es1688/es1688_lib.c
+++ b/sound/isa/es1688/es1688_lib.c
@@ -614,8 +614,7 @@  static int snd_es1688_free(struct snd_es1688 *chip)
 {
 	if (chip->hardware != ES1688_HW_UNDEF)
 		snd_es1688_init(chip, 0);
-	if (chip->res_port)
-		release_and_free_resource(chip->res_port);
+	release_and_free_resource(chip->res_port);
 	if (chip->irq >= 0)
 		free_irq(chip->irq, (void *) chip);
 	if (chip->dma8 >= 0) {