summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-04-25 11:18:48 +0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-05-15 09:27:27 +0400
commit88e89f5548a6e19bf837633f622764f2d1531748 (patch)
tree6ea20bb434c2b41ae340df76e7bb09f2198858c1
parent3b7d46380beae3de4a0f03ba4dcbd509c97ab503 (diff)
downloadop-kernel-dev-88e89f5548a6e19bf837633f622764f2d1531748.zip
op-kernel-dev-88e89f5548a6e19bf837633f622764f2d1531748.tar.gz
ASoC: fsl: create function imx_pcm_fiq_exit()
Create function imx_pcm_fiq_exit() to be paired with imx_pcm_fiq_init() just like the pair of imx_pcm_dma_init() and imx_pcm_dma_exit(). Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r--sound/soc/fsl/imx-pcm-fiq.c5
-rw-r--r--sound/soc/fsl/imx-pcm.c2
-rw-r--r--sound/soc/fsl/imx-pcm.h5
3 files changed, 11 insertions, 1 deletions
diff --git a/sound/soc/fsl/imx-pcm-fiq.c b/sound/soc/fsl/imx-pcm-fiq.c
index 670b96b..710c069 100644
--- a/sound/soc/fsl/imx-pcm-fiq.c
+++ b/sound/soc/fsl/imx-pcm-fiq.c
@@ -314,3 +314,8 @@ failed_register:
return ret;
}
+
+void imx_pcm_fiq_exit(struct platform_device *pdev)
+{
+ snd_soc_unregister_platform(&pdev->dev);
+}
diff --git a/sound/soc/fsl/imx-pcm.c b/sound/soc/fsl/imx-pcm.c
index c498964..16a956b 100644
--- a/sound/soc/fsl/imx-pcm.c
+++ b/sound/soc/fsl/imx-pcm.c
@@ -115,7 +115,7 @@ static int imx_pcm_probe(struct platform_device *pdev)
static int imx_pcm_remove(struct platform_device *pdev)
{
if (strcmp(pdev->id_entry->name, "imx-fiq-pcm-audio") == 0)
- snd_soc_unregister_platform(&pdev->dev);
+ imx_pcm_fiq_exit(pdev);
else
imx_pcm_dma_exit(pdev);
diff --git a/sound/soc/fsl/imx-pcm.h b/sound/soc/fsl/imx-pcm.h
index b7fa0d7..073bf38 100644
--- a/sound/soc/fsl/imx-pcm.h
+++ b/sound/soc/fsl/imx-pcm.h
@@ -53,11 +53,16 @@ static inline void imx_pcm_dma_exit(struct platform_device *pdev)
#ifdef CONFIG_SND_SOC_IMX_PCM_FIQ
int imx_pcm_fiq_init(struct platform_device *pdev);
+void imx_pcm_fiq_exit(struct platform_device *pdev);
#else
static inline int imx_pcm_fiq_init(struct platform_device *pdev)
{
return -ENODEV;
}
+
+static inline void imx_pcm_fiq_exit(struct platform_device *pdev)
+{
+}
#endif
#endif /* _IMX_PCM_H */
OpenPOWER on IntegriCloud