diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-12-10 12:34:45 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-18 18:54:00 +0000 |
| commit | 6f2032a18969d22740a865e0b4f2e48cf5338f36 (patch) | |
| tree | febca721ef37f8d0ff3cc67a29e9d29181414a33 /sound/soc/cirrus/ep93xx-i2s.c | |
| parent | 237eeb1c044fdd0f406a8484ee31884e34b9dfc5 (diff) | |
| download | lwn-6f2032a18969d22740a865e0b4f2e48cf5338f36.tar.gz lwn-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-i2s.c')
| -rw-r--r-- | sound/soc/cirrus/ep93xx-i2s.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/cirrus/ep93xx-i2s.c b/sound/soc/cirrus/ep93xx-i2s.c index a57643d6402f..167728a73da2 100644 --- a/sound/soc/cirrus/ep93xx-i2s.c +++ b/sound/soc/cirrus/ep93xx-i2s.c @@ -30,6 +30,8 @@ #include <mach/ep93xx-regs.h> #include <linux/platform_data/dma-ep93xx.h> +#include "ep93xx-pcm.h" + #define EP93XX_I2S_TXCLKCFG 0x00 #define EP93XX_I2S_RXCLKCFG 0x04 #define EP93XX_I2S_GLCTRL 0x0C @@ -405,8 +407,14 @@ static int ep93xx_i2s_probe(struct platform_device *pdev) if (err) goto fail_put_lrclk; + err = devm_ep93xx_pcm_platform_register(&pdev->dev); + if (err) + goto fail_unregister; + return 0; +fail_unregister: + snd_soc_unregister_component(&pdev->dev); fail_put_lrclk: clk_put(info->lrclk); fail_put_sclk: |