aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-08-25 23:05:58 -0400
committerMark Brown <broonie@kernel.org>2016-09-01 16:22:59 -0400
commitf93b646d5124183ab76cb820d5b21a7741726eba (patch)
treea18faf201e03305b17b601f547084ec7004eb3c0
parenta03b0545c26d88ae92cdfc662cad4364e8c627a3 (diff)
ASoC: simple-card: tidyup mclk-fs of_property_read_u32() usage
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>
-rw-r--r--sound/soc/generic/simple-card.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 3ce8bb6aa4ef..a4a39d41b634 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -222,7 +222,6 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
222 char prop[128]; 222 char prop[128];
223 char *prefix = ""; 223 char *prefix = "";
224 int ret, single_cpu; 224 int ret, single_cpu;
225 u32 val;
226 225
227 /* For single DAI link & old style of DT node */ 226 /* For single DAI link & old style of DT node */
228 if (is_top_level_node) 227 if (is_top_level_node)
@@ -248,8 +247,7 @@ static int asoc_simple_card_dai_link_of(struct device_node *node,
248 if (ret < 0) 247 if (ret < 0)
249 goto dai_link_of_err; 248 goto dai_link_of_err;
250 249
251 if (!of_property_read_u32(node, "mclk-fs", &val)) 250 of_property_read_u32(node, "mclk-fs", &dai_props->mclk_fs);
252 dai_props->mclk_fs = val;
253 251
254 ret = asoc_simple_card_parse_cpu(cpu, dai_link, 252 ret = asoc_simple_card_parse_cpu(cpu, dai_link,
255 DAI, CELL, &single_cpu); 253 DAI, CELL, &single_cpu);
@@ -323,7 +321,6 @@ static int asoc_simple_card_parse_of(struct device_node *node,
323{ 321{
324 struct device *dev = simple_priv_to_dev(priv); 322 struct device *dev = simple_priv_to_dev(priv);
325 struct device_node *dai_link; 323 struct device_node *dai_link;
326 u32 val;
327 int ret; 324 int ret;
328 325
329 if (!node) 326 if (!node)
@@ -348,9 +345,7 @@ static int asoc_simple_card_parse_of(struct device_node *node,
348 } 345 }
349 346
350 /* Factor to mclk, used in hw_params() */ 347 /* Factor to mclk, used in hw_params() */
351 ret = of_property_read_u32(node, PREFIX "mclk-fs", &val); 348 of_property_read_u32(node, PREFIX "mclk-fs", &priv->mclk_fs);
352 if (ret == 0)
353 priv->mclk_fs = val;
354 349
355 /* Single/Muti DAI link(s) & New style of DT node */ 350 /* Single/Muti DAI link(s) & New style of DT node */
356 if (dai_link) { 351 if (dai_link) {