ASoC: simple-card: Delete unneeded test before of_node_put
authorFabio Estevam <fabio.estevam@freescale.com>
Tue, 7 Oct 2014 18:29:58 +0000 (15:29 -0300)
committerMark Brown <broonie@kernel.org>
Mon, 20 Oct 2014 11:22:40 +0000 (12:22 +0100)
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>
sound/soc/generic/simple-card.c

index d1b7293c133eaa456f9d7761f273ee2887251121..4f192ee3cb166c5a37bd6fcdeac4b38b3806d3dc 100644 (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_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;
 }