aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/sound/soc/cirrus/ep93xx-ac97.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2013-12-10 12:34:45 -0700
committerMark Brown <broonie@linaro.org>2013-12-18 18:54:00 +0000
commit6f2032a18969d22740a865e0b4f2e48cf5338f36 (patch)
treefebca721ef37f8d0ff3cc67a29e9d29181414a33 /sound/soc/cirrus/ep93xx-ac97.c
parentASoC: ep93xx: Use devm_snd_dmaengine_pcm_register() (diff)
downloadwireguard-linux-6f2032a18969d22740a865e0b4f2e48cf5338f36.tar.xz
wireguard-linux-6f2032a18969d22740a865e0b4f2e48cf5338f36.zip
ASoC: ep93xx: get rid of ep93xx-pcm-audio struct device
Modify the ep93xx PCM driver so that it's a utility library that can be registered on each DAI, rather than a separate struct device. This is more in line with how many recent DT-converted platforms operate, and avoids the need for yet another struct device. Signed-off-by: Stephen Warren <swarren@nvidia.com> Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/cirrus/ep93xx-ac97.c')
-rw-r--r--sound/soc/cirrus/ep93xx-ac97.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/cirrus/ep93xx-ac97.c b/sound/soc/cirrus/ep93xx-ac97.c
index efa75b5086a4..cc5583da5380 100644
--- a/sound/soc/cirrus/ep93xx-ac97.c
+++ b/sound/soc/cirrus/ep93xx-ac97.c
@@ -24,6 +24,8 @@
#include <linux/platform_data/dma-ep93xx.h>
+#include "ep93xx-pcm.h"
+
/*
* Per channel (1-4) registers.
*/
@@ -394,8 +396,14 @@ static int ep93xx_ac97_probe(struct platform_device *pdev)
if (ret)
goto fail;
+ ret = devm_ep93xx_pcm_platform_register(&pdev->dev);
+ if (ret)
+ goto fail_unregister;
+
return 0;
+fail_unregister:
+ snd_soc_unregister_component(&pdev->dev);
fail:
ep93xx_ac97_info = NULL;
snd_soc_set_ac97_ops(NULL);