diff options
author | Mark Brown <broonie@kernel.org> | 2021-06-25 15:08:03 +0200 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-06-25 15:08:03 +0200 |
commit | 192664528154a84fab4e6d820f9cb2e2e0835544 (patch) | |
tree | 4fd7c74097fc474150317fb04245460f0992af17 /sound/soc/fsl/fsl_ssi.c | |
parent | Merge remote-tracking branch 'asoc/for-5.13' into asoc-linus (diff) | |
parent | ASoC: qcom: lpass-cpu: mark IRQ_CLEAR register as volatile and readable (diff) | |
download | linux-192664528154a84fab4e6d820f9cb2e2e0835544.tar.xz linux-192664528154a84fab4e6d820f9cb2e2e0835544.zip |
Merge remote-tracking branch 'asoc/for-5.14' into asoc-next
Diffstat (limited to 'sound/soc/fsl/fsl_ssi.c')
-rw-r--r-- | sound/soc/fsl/fsl_ssi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 2b57b60431bb..ecbc1c365d5b 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c @@ -1503,8 +1503,7 @@ static int fsl_ssi_probe(struct platform_device *pdev) } ssi->cpu_dai_drv.name = dev_name(dev); - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - iomem = devm_ioremap_resource(dev, res); + iomem = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(iomem)) return PTR_ERR(iomem); ssi->ssi_phys = res->start; |