luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: simple-card: Delete unneeded test before of_node_put

Browse Source 
of_node_put() supports NULL as its argument, so the initial test is not
necessary.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Fabio Estevam 2014-10-07 15:29:58 -03:00 committed by Mark Brown
parent f114040e3e
commit 84d4cbe9a6
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sound/soc/generic/simple-card.c
View File

@ -368,12 +368,9 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
dai_link->cpu_dai_name = NULL; dai_link->cpu_dai_name = NULL;
dai_link_of_err: dai_link_of_err:
if (np) of_node_put(np);
of_node_put(np); of_node_put(bitclkmaster);
if (bitclkmaster) of_node_put(framemaster);
of_node_put(bitclkmaster);
if (framemaster)
of_node_put(framemaster);
return ret; return ret;
} }
@ -464,11 +461,9 @@ static int asoc_simple_card_unref(struct platform_device *pdev)
num_links < card->num_links; num_links < card->num_links;
num_links++, dai_link++) { num_links++, dai_link++) {
np = (struct device_node *) dai_link->cpu_of_node; np = (struct device_node *) dai_link->cpu_of_node;
if (np) of_node_put(np);
of_node_put(np);
np = (struct device_node *) dai_link->codec_of_node; np = (struct device_node *) dai_link->codec_of_node;
if (np) of_node_put(np);
of_node_put(np);
} }
return 0; return 0;
} }