aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCodrut Grosu <codrut.cristian.grosu@gmail.com>2017-02-25 14:59:33 -0500
committerMark Brown <broonie@kernel.org>2017-03-07 08:31:51 -0500
commitadbdba3fa1b618376363db317324c69d8ce5659c (patch)
treed2cef0cd1b7845637c7f9c79155f44d025b68d40
parentc1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 (diff)
ASoC: sirf: Added blank line after declarations
This was reported by checkpatch.pl Signed-off-by: Codrut GROSU <codrut.cristian.grosu@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/sirf/sirf-audio-port.c1
-rw-r--r--sound/soc/sirf/sirf-audio.c1
-rw-r--r--sound/soc/sirf/sirf-usp.c3
3 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/sirf/sirf-audio-port.c b/sound/soc/sirf/sirf-audio-port.c
index 3f2cce03275c..be066de74aaa 100644
--- a/sound/soc/sirf/sirf-audio-port.c
+++ b/sound/soc/sirf/sirf-audio-port.c
@@ -19,6 +19,7 @@ struct sirf_audio_port {
19static int sirf_audio_port_dai_probe(struct snd_soc_dai *dai) 19static int sirf_audio_port_dai_probe(struct snd_soc_dai *dai)
20{ 20{
21 struct sirf_audio_port *port = snd_soc_dai_get_drvdata(dai); 21 struct sirf_audio_port *port = snd_soc_dai_get_drvdata(dai);
22
22 snd_soc_dai_init_dma_data(dai, &port->playback_dma_data, 23 snd_soc_dai_init_dma_data(dai, &port->playback_dma_data,
23 &port->capture_dma_data); 24 &port->capture_dma_data);
24 return 0; 25 return 0;
diff --git a/sound/soc/sirf/sirf-audio.c b/sound/soc/sirf/sirf-audio.c
index 94ea152e0362..f2bc50790f76 100644
--- a/sound/soc/sirf/sirf-audio.c
+++ b/sound/soc/sirf/sirf-audio.c
@@ -27,6 +27,7 @@ static int sirf_audio_hp_event(struct snd_soc_dapm_widget *w,
27 struct snd_soc_card *card = dapm->card; 27 struct snd_soc_card *card = dapm->card;
28 struct sirf_audio_card *sirf_audio_card = snd_soc_card_get_drvdata(card); 28 struct sirf_audio_card *sirf_audio_card = snd_soc_card_get_drvdata(card);
29 int on = !SND_SOC_DAPM_EVENT_OFF(event); 29 int on = !SND_SOC_DAPM_EVENT_OFF(event);
30
30 if (gpio_is_valid(sirf_audio_card->gpio_hp_pa)) 31 if (gpio_is_valid(sirf_audio_card->gpio_hp_pa))
31 gpio_set_value(sirf_audio_card->gpio_hp_pa, on); 32 gpio_set_value(sirf_audio_card->gpio_hp_pa, on);
32 return 0; 33 return 0;
diff --git a/sound/soc/sirf/sirf-usp.c b/sound/soc/sirf/sirf-usp.c
index 45fc06c0e0e5..77e7dcf969d0 100644
--- a/sound/soc/sirf/sirf-usp.c
+++ b/sound/soc/sirf/sirf-usp.c
@@ -71,6 +71,7 @@ static void sirf_usp_rx_disable(struct sirf_usp *usp)
71static int sirf_usp_pcm_dai_probe(struct snd_soc_dai *dai) 71static int sirf_usp_pcm_dai_probe(struct snd_soc_dai *dai)
72{ 72{
73 struct sirf_usp *usp = snd_soc_dai_get_drvdata(dai); 73 struct sirf_usp *usp = snd_soc_dai_get_drvdata(dai);
74
74 snd_soc_dai_init_dma_data(dai, &usp->playback_dma_data, 75 snd_soc_dai_init_dma_data(dai, &usp->playback_dma_data,
75 &usp->capture_dma_data); 76 &usp->capture_dma_data);
76 return 0; 77 return 0;
@@ -294,6 +295,7 @@ static struct snd_soc_dai_driver sirf_usp_pcm_dai = {
294static int sirf_usp_pcm_runtime_suspend(struct device *dev) 295static int sirf_usp_pcm_runtime_suspend(struct device *dev)
295{ 296{
296 struct sirf_usp *usp = dev_get_drvdata(dev); 297 struct sirf_usp *usp = dev_get_drvdata(dev);
298
297 clk_disable_unprepare(usp->clk); 299 clk_disable_unprepare(usp->clk);
298 return 0; 300 return 0;
299} 301}
@@ -302,6 +304,7 @@ static int sirf_usp_pcm_runtime_resume(struct device *dev)
302{ 304{
303 struct sirf_usp *usp = dev_get_drvdata(dev); 305 struct sirf_usp *usp = dev_get_drvdata(dev);
304 int ret; 306 int ret;
307
305 ret = clk_prepare_enable(usp->clk); 308 ret = clk_prepare_enable(usp->clk);
306 if (ret) { 309 if (ret) {
307 dev_err(dev, "clk_enable failed: %d\n", ret); 310 dev_err(dev, "clk_enable failed: %d\n", ret);