diff options
| author | Mark Brown <broonie@kernel.org> | 2023-06-16 14:55:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-06-16 14:55:20 +0100 |
| commit | 1a32b4b9a6229233de70cec28fb5a87fabac2c41 (patch) | |
| tree | 773f8a5c40ac3176d2a0613c51fc4cd333b1bcc2 /sound/soc/amd/ps/ps-pdm-dma.c | |
| parent | 928314eb06709e3861ce3e2c7e9ef3f83ba8691b (diff) | |
| parent | f9fd804aa0a36f15a35ca070ec4c52650876cc29 (diff) | |
ASoC: Merge fixes due to dependencies
So we can apply the tlv320aic3xxx DT conversion.
Diffstat (limited to 'sound/soc/amd/ps/ps-pdm-dma.c')
| -rw-r--r-- | sound/soc/amd/ps/ps-pdm-dma.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/amd/ps/ps-pdm-dma.c b/sound/soc/amd/ps/ps-pdm-dma.c index 3ecc6cf3fd34..bdbbb797c74d 100644 --- a/sound/soc/amd/ps/ps-pdm-dma.c +++ b/sound/soc/amd/ps/ps-pdm-dma.c @@ -358,12 +358,12 @@ static int acp63_pdm_audio_probe(struct platform_device *pdev) { struct resource *res; struct pdm_dev_data *adata; + struct acp63_dev_data *acp_data; + struct device *parent; int status; - if (!pdev->dev.platform_data) { - dev_err(&pdev->dev, "platform_data not retrieved\n"); - return -ENODEV; - } + parent = pdev->dev.parent; + acp_data = dev_get_drvdata(parent); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { dev_err(&pdev->dev, "IORESOURCE_MEM FAILED\n"); @@ -379,7 +379,7 @@ static int acp63_pdm_audio_probe(struct platform_device *pdev) return -ENOMEM; adata->capture_stream = NULL; - adata->acp_lock = pdev->dev.platform_data; + adata->acp_lock = &acp_data->acp_lock; dev_set_drvdata(&pdev->dev, adata); status = devm_snd_soc_register_component(&pdev->dev, &acp63_pdm_component, |