diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-12-10 12:35:24 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-18 18:55:02 +0000 |
| commit | ede38884ac25ed78e43f3480056670963a9980f0 (patch) | |
| tree | 9c9c434b532a9f0faf4b248b1d2d6c8afcb40785 /sound/soc/spear/spdif_in.c | |
| parent | d71b3ef44f9e5cfda2499768f6420b784845af06 (diff) | |
| download | blackbird-op-linux-ede38884ac25ed78e43f3480056670963a9980f0.tar.gz blackbird-op-linux-ede38884ac25ed78e43f3480056670963a9980f0.zip | |
ASoC: SPEAr: get rid of spear-pcm-audio struct device
Modify the SPEAr 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.
This is also required as a pre-cursor to removing
spear_pcm_request_chan().
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'sound/soc/spear/spdif_in.c')
| -rw-r--r-- | sound/soc/spear/spdif_in.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sound/soc/spear/spdif_in.c b/sound/soc/spear/spdif_in.c index 21a8c954af1c..4627110f3441 100644 --- a/sound/soc/spear/spdif_in.c +++ b/sound/soc/spear/spdif_in.c @@ -24,6 +24,7 @@ #include <sound/spear_dma.h> #include <sound/spear_spdif.h> #include "spdif_in_regs.h" +#include "spear_pcm.h" struct spdif_in_params { u32 format; @@ -257,8 +258,12 @@ static int spdif_in_probe(struct platform_device *pdev) return ret; } - return devm_snd_soc_register_component(&pdev->dev, &spdif_in_component, - &spdif_in_dai, 1); + ret = devm_snd_soc_register_component(&pdev->dev, &spdif_in_component, + &spdif_in_dai, 1); + if (ret) + return ret; + + return devm_spear_pcm_platform_register(&pdev->dev); } static struct platform_driver spdif_in_driver = { |
