summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2021-06-17 16:27:24 +0200
committerMark Brown <broonie@kernel.org>2021-06-17 16:27:24 +0200
commit4cb9d648f669c4e31bec4447c98553c65079681b (patch)
treef59e775775e306e0850f22559002ccc2dedf3008 /sound
parentASoC: spear: spdif_out: Use devm_platform_get_and_ioremap_resource() (diff)
parentASoC: stm32: spdifrx: Use devm_platform_get_and_ioremap_resource() (diff)
downloadlinux-4cb9d648f669c4e31bec4447c98553c65079681b.tar.xz
linux-4cb9d648f669c4e31bec4447c98553c65079681b.zip
Merge series "ASoC: stm32: Use devm_platform_get_and_ioremap_resource()" from Yang Yingliang <yangyingliang@huawei.com>:
Use devm_platform_get_and_ioremap_resource() to simplify code. Yang Yingliang (3): ASoC: stm32: i2s: Use devm_platform_get_and_ioremap_resource() ASoC: stm32: sai: Use devm_platform_get_and_ioremap_resource() ASoC: stm32: spdifrx: Use devm_platform_get_and_ioremap_resource() sound/soc/stm/stm32_i2s.c | 3 +-- sound/soc/stm/stm32_sai_sub.c | 3 +-- sound/soc/stm/stm32_spdifrx.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) -- 2.25.1
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/stm/stm32_i2s.c3
-rw-r--r--sound/soc/stm/stm32_sai_sub.c3
-rw-r--r--sound/soc/stm/stm32_spdifrx.c3
3 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/stm/stm32_i2s.c b/sound/soc/stm/stm32_i2s.c
index 7d1672cf78cc..6254bacad6eb 100644
--- a/sound/soc/stm/stm32_i2s.c
+++ b/sound/soc/stm/stm32_i2s.c
@@ -1036,8 +1036,7 @@ static int stm32_i2s_parse_dt(struct platform_device *pdev,
else
return -EINVAL;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- i2s->base = devm_ioremap_resource(&pdev->dev, res);
+ i2s->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(i2s->base))
return PTR_ERR(i2s->base);
diff --git a/sound/soc/stm/stm32_sai_sub.c b/sound/soc/stm/stm32_sai_sub.c
index 3aa1cf262402..9c3b8e209656 100644
--- a/sound/soc/stm/stm32_sai_sub.c
+++ b/sound/soc/stm/stm32_sai_sub.c
@@ -1361,8 +1361,7 @@ static int stm32_sai_sub_parse_of(struct platform_device *pdev,
if (!np)
return -ENODEV;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- base = devm_ioremap_resource(&pdev->dev, res);
+ base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);
if (IS_ERR(base))
return PTR_ERR(base);
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);