Loading sound/soc/au1x/dbdma2.c +8 −5 Original line number Original line Diff line number Diff line Loading @@ -32,6 +32,8 @@ /*#define PCM_DEBUG*/ /*#define PCM_DEBUG*/ #define DRV_NAME "dbdma2" #define MSG(x...) printk(KERN_INFO "au1xpsc_pcm: " x) #define MSG(x...) printk(KERN_INFO "au1xpsc_pcm: " x) #ifdef PCM_DEBUG #ifdef PCM_DEBUG #define DBG MSG #define DBG MSG Loading Loading @@ -187,8 +189,8 @@ static int au1x_pcm_dbdma_realloc(struct au1xpsc_audio_dmadata *pcd, static inline struct au1xpsc_audio_dmadata *to_dmadata(struct snd_pcm_substream *ss) static inline struct au1xpsc_audio_dmadata *to_dmadata(struct snd_pcm_substream *ss) { { struct snd_soc_pcm_runtime *rtd = ss->private_data; struct snd_soc_pcm_runtime *rtd = ss->private_data; struct au1xpsc_audio_dmadata *pcd = struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME); snd_soc_platform_get_drvdata(rtd->platform); struct au1xpsc_audio_dmadata *pcd = snd_soc_component_get_drvdata(component); return &pcd[ss->stream]; return &pcd[ss->stream]; } } Loading Loading @@ -327,7 +329,8 @@ static int au1xpsc_pcm_new(struct snd_soc_pcm_runtime *rtd) } } /* au1xpsc audio platform */ /* au1xpsc audio platform */ static struct snd_soc_platform_driver au1xpsc_soc_platform = { static struct snd_soc_component_driver au1xpsc_soc_component = { .name = DRV_NAME, .ops = &au1xpsc_pcm_ops, .ops = &au1xpsc_pcm_ops, .pcm_new = au1xpsc_pcm_new, .pcm_new = au1xpsc_pcm_new, }; }; Loading @@ -344,8 +347,8 @@ static int au1xpsc_pcm_drvprobe(struct platform_device *pdev) platform_set_drvdata(pdev, dmadata); platform_set_drvdata(pdev, dmadata); return devm_snd_soc_register_platform(&pdev->dev, return devm_snd_soc_register_component(&pdev->dev, &au1xpsc_soc_platform); &au1xpsc_soc_component, NULL, 0); } } static struct platform_driver au1xpsc_pcm_driver = { static struct platform_driver au1xpsc_pcm_driver = { Loading Loading
sound/soc/au1x/dbdma2.c +8 −5 Original line number Original line Diff line number Diff line Loading @@ -32,6 +32,8 @@ /*#define PCM_DEBUG*/ /*#define PCM_DEBUG*/ #define DRV_NAME "dbdma2" #define MSG(x...) printk(KERN_INFO "au1xpsc_pcm: " x) #define MSG(x...) printk(KERN_INFO "au1xpsc_pcm: " x) #ifdef PCM_DEBUG #ifdef PCM_DEBUG #define DBG MSG #define DBG MSG Loading Loading @@ -187,8 +189,8 @@ static int au1x_pcm_dbdma_realloc(struct au1xpsc_audio_dmadata *pcd, static inline struct au1xpsc_audio_dmadata *to_dmadata(struct snd_pcm_substream *ss) static inline struct au1xpsc_audio_dmadata *to_dmadata(struct snd_pcm_substream *ss) { { struct snd_soc_pcm_runtime *rtd = ss->private_data; struct snd_soc_pcm_runtime *rtd = ss->private_data; struct au1xpsc_audio_dmadata *pcd = struct snd_soc_component *component = snd_soc_rtdcom_lookup(rtd, DRV_NAME); snd_soc_platform_get_drvdata(rtd->platform); struct au1xpsc_audio_dmadata *pcd = snd_soc_component_get_drvdata(component); return &pcd[ss->stream]; return &pcd[ss->stream]; } } Loading Loading @@ -327,7 +329,8 @@ static int au1xpsc_pcm_new(struct snd_soc_pcm_runtime *rtd) } } /* au1xpsc audio platform */ /* au1xpsc audio platform */ static struct snd_soc_platform_driver au1xpsc_soc_platform = { static struct snd_soc_component_driver au1xpsc_soc_component = { .name = DRV_NAME, .ops = &au1xpsc_pcm_ops, .ops = &au1xpsc_pcm_ops, .pcm_new = au1xpsc_pcm_new, .pcm_new = au1xpsc_pcm_new, }; }; Loading @@ -344,8 +347,8 @@ static int au1xpsc_pcm_drvprobe(struct platform_device *pdev) platform_set_drvdata(pdev, dmadata); platform_set_drvdata(pdev, dmadata); return devm_snd_soc_register_platform(&pdev->dev, return devm_snd_soc_register_component(&pdev->dev, &au1xpsc_soc_platform); &au1xpsc_soc_component, NULL, 0); } } static struct platform_driver au1xpsc_pcm_driver = { static struct platform_driver au1xpsc_pcm_driver = { Loading