diff options
author | Mark Brown <broonie@kernel.org> | 2021-06-25 14:08:03 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2021-06-25 14:08:03 +0100 |
commit | 192664528154a84fab4e6d820f9cb2e2e0835544 (patch) | |
tree | 4fd7c74097fc474150317fb04245460f0992af17 /sound/soc/stm/stm32_spdifrx.c | |
parent | c073a58a7ec59145f8a0b87403d559645bfd9edb (diff) | |
parent | 6a7f5bd6185e1c86256d5e52c3bb7a4d390d6e19 (diff) |
Merge remote-tracking branch 'asoc/for-5.14' into asoc-next
Diffstat (limited to 'sound/soc/stm/stm32_spdifrx.c')
-rw-r--r-- | sound/soc/stm/stm32_spdifrx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/stm/stm32_spdifrx.c b/sound/soc/stm/stm32_spdifrx.c index 1bfa3b2ba974..48145f553588 100644 --- a/sound/soc/stm/stm32_spdifrx.c +++ b/sound/soc/stm/stm32_spdifrx.c @@ -922,8 +922,7 @@ static int stm32_spdifrx_parse_of(struct platform_device *pdev, else return -EINVAL; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - spdifrx->base = devm_ioremap_resource(&pdev->dev, res); + spdifrx->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(spdifrx->base)) return PTR_ERR(spdifrx->base); |