[alsa-devel] [PATCH 4/4] ASoC: simple-card: Delete unneeded test before of_node_put
Fabio Estevam
fabio.estevam at freescale.com
Tue Oct 7 20:29:58 CEST 2014
of_node_put() supports NULL as its argument, so the initial test is not
necessary.
Signed-off-by: Fabio Estevam <fabio.estevam at freescale.com>
---
sound/soc/generic/simple-card.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index fcb431f..ecba061 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -368,12 +368,9 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
dai_link->cpu_dai_name = NULL;
dai_link_of_err:
- if (np)
- of_node_put(np);
- if (bitclkmaster)
- of_node_put(bitclkmaster);
- if (framemaster)
- of_node_put(framemaster);
+ of_node_put(np);
+ of_node_put(bitclkmaster);
+ of_node_put(framemaster);
return ret;
}
@@ -464,11 +461,9 @@ static int asoc_simple_card_unref(struct platform_device *pdev)
num_links < card->num_links;
num_links++, dai_link++) {
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;
- if (np)
- of_node_put(np);
+ of_node_put(np);
}
return 0;
}
--
1.9.1
More information about the Alsa-devel
mailing list