These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / sound / soc / pxa / pxa2xx-i2s.c

diff --git a/kernel/sound/soc/pxa/pxa2xx-i2s.c b/kernel/sound/soc/pxa/pxa2xx-i2s.c
index e68290c..0389cf7 100644 (file)
--- a/kernel/sound/soc/pxa/pxa2xx-i2s.c
+++ b/kernel/sound/soc/pxa/pxa2xx-i2s.c
@@ -319,6 +319,9 @@ static int pxa2xx_i2s_probe(struct snd_soc_dai *dai)
        /* Along with FIFO servicing */
        SAIMR &= ~(SAIMR_RFS | SAIMR_TFS);
 
+       snd_soc_dai_init_dma_data(dai, &pxa2xx_i2s_pcm_stereo_out,
+               &pxa2xx_i2s_pcm_stereo_in);
+
        return 0;
 }
 
@@ -367,19 +370,12 @@ static const struct snd_soc_component_driver pxa_i2s_component = {
 
 static int pxa2xx_i2s_drv_probe(struct platform_device *pdev)
 {
-       return snd_soc_register_component(&pdev->dev, &pxa_i2s_component,
-                                         &pxa_i2s_dai, 1);
-}
-
-static int pxa2xx_i2s_drv_remove(struct platform_device *pdev)
-{
-       snd_soc_unregister_component(&pdev->dev);
-       return 0;
+       return devm_snd_soc_register_component(&pdev->dev, &pxa_i2s_component,
+                                              &pxa_i2s_dai, 1);
 }
 
 static struct platform_driver pxa2xx_i2s_driver = {
        .probe = pxa2xx_i2s_drv_probe,
-       .remove = pxa2xx_i2s_drv_remove,
 
        .driver = {
                .name = "pxa2xx-i2s",