ASoC: simple-card: tidyup mclk-fs of_property_read_u32() usage
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Fri, 26 Aug 2016 03:05:58 +0000 (03:05 +0000)
committerMark Brown <broonie@kernel.org>
Thu, 1 Sep 2016 20:22:59 +0000 (21:22 +0100)
of_property_read_u32() do nothing in error case.
Let's tidyup useless usage.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/generic/simple-card.c

index 3ce8bb6aa4ef47581be2922cea169a69d8c2aec3..a4a39d41b63458326eaf62ab03d3fe2a394ad31a 100644 (file)
@@ -222,7 +222,6 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
        char prop[128];
        char *prefix = "";
        int ret, single_cpu;
-       u32 val;
 
        /* For single DAI link & old style of DT node */
        if (is_top_level_node)
@@ -248,8 +247,7 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
        if (ret < 0)
                goto dai_link_of_err;
 
-       if (!of_property_read_u32(node, "mclk-fs", &val))
-               dai_props->mclk_fs = val;
+       of_property_read_u32(node, "mclk-fs", &dai_props->mclk_fs);
 
        ret = asoc_simple_card_parse_cpu(cpu, dai_link,
                                         DAI, CELL, &single_cpu);
@@ -323,7 +321,6 @@ static int asoc_simple_card_parse_of(struct device_node *node,
 {
        struct device *dev = simple_priv_to_dev(priv);
        struct device_node *dai_link;
-       u32 val;
        int ret;
 
        if (!node)
@@ -348,9 +345,7 @@ static int asoc_simple_card_parse_of(struct device_node *node,
        }
 
        /* Factor to mclk, used in hw_params() */
-       ret = of_property_read_u32(node, PREFIX "mclk-fs", &val);
-       if (ret == 0)
-               priv->mclk_fs = val;
+       of_property_read_u32(node, PREFIX "mclk-fs", &priv->mclk_fs);
 
        /* Single/Muti DAI link(s) & New style of DT node */
        if (dai_link) {