summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-08-26 03:07:59 +0000
committerMark Brown <broonie@kernel.org>2016-09-01 21:22:59 +0100
commit387f5823f400445ed0152bfa06eef50a382b9219 (patch)
tree30a899176b02b1d6d5c09ddb9fc1da9040dae0c1 /sound
parenta1dbfd001310c429fce9e066730302c82f68bd19 (diff)
downloadlinux-387f5823f400445ed0152bfa06eef50a382b9219.tar.gz
linux-387f5823f400445ed0152bfa06eef50a382b9219.tar.bz2
linux-387f5823f400445ed0152bfa06eef50a382b9219.zip
ASoC: simple-card: code sync: tidyup white line
simple sound card family are using very similar style, but because of its historical reason, there are small differences. For example pointer style, function name, caller postion etc... This patch synchronized simple card style to other simple card family. This patch tidyups white line Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/generic/simple-card.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c
index 7b0a56f78db0..7d15b5086c7a 100644
--- a/sound/soc/generic/simple-card.c
+++ b/sound/soc/generic/simple-card.c
@@ -120,7 +120,7 @@ static int asoc_simple_card_startup(struct snd_pcm_substream *substream)
ret = clk_prepare_enable(dai_props->cpu_dai.clk);
if (ret)
return ret;
-
+
ret = clk_prepare_enable(dai_props->codec_dai.clk);
if (ret)
clk_disable_unprepare(dai_props->cpu_dai.clk);
@@ -454,7 +454,6 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
sizeof(priv->dai_props->cpu_dai));
memcpy(&priv->dai_props->codec_dai, &cinfo->codec_dai,
sizeof(priv->dai_props->codec_dai));
-
}
snd_soc_card_set_drvdata(&priv->snd_card, priv);
@@ -462,9 +461,9 @@ static int asoc_simple_card_probe(struct platform_device *pdev)
ret = devm_snd_soc_register_card(&pdev->dev, &priv->snd_card);
if (ret >= 0)
return ret;
-
err:
asoc_simple_card_clean_reference(&priv->snd_card);
+
return ret;
}