ALSA: hda: Delete an unnecessary check before the function call "kobject_put"
diff mbox

Message ID 559D7AAD.8020500@users.sourceforge.net
State New
Headers show

Commit Message

SF Markus Elfring July 8, 2015, 7:31 p.m. UTC
From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 8 Jul 2015 21:26:02 +0200

The kobject_put() 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/hda/hdac_sysfs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Takashi Iwai July 9, 2015, 12:21 p.m. UTC | #1
On Wed, 08 Jul 2015 21:31:57 +0200,
SF Markus Elfring wrote:
> 
> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Wed, 8 Jul 2015 21:26:02 +0200
> 
> The kobject_put() 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/hda/hdac_sysfs.c | 3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/sound/hda/hdac_sysfs.c b/sound/hda/hdac_sysfs.c
> index 0a6ce3b..089b35f 100644
> --- a/sound/hda/hdac_sysfs.c
> +++ b/sound/hda/hdac_sysfs.c
> @@ -321,8 +321,7 @@ static void widget_tree_free(struct hdac_device *codec)
>  			free_widget_node(*p, &widget_node_group);
>  		kfree(tree->nodes);
>  	}
> -	if (tree->root)
> -		kobject_put(tree->root);
> +	kobject_put(tree->root);
>  	kfree(tree);
>  	codec->widgets = NULL;
>  }
> -- 
> 2.4.5
>

Patch
diff mbox

diff --git a/sound/hda/hdac_sysfs.c b/sound/hda/hdac_sysfs.c
index 0a6ce3b..089b35f 100644
--- a/sound/hda/hdac_sysfs.c
+++ b/sound/hda/hdac_sysfs.c
@@ -321,8 +321,7 @@  static void widget_tree_free(struct hdac_device *codec)
 			free_widget_node(*p, &widget_node_group);
 		kfree(tree->nodes);
 	}
-	if (tree->root)
-		kobject_put(tree->root);
+	kobject_put(tree->root);
 	kfree(tree);
 	codec->widgets = NULL;
 }