diff options
| author | Mark Brown | 2021-06-21 19:16:52 +0100 |
|---|---|---|
| committer | Mark Brown | 2021-06-21 19:16:52 +0100 |
| commit | ef7eb57d21e88ecb2a4e2c6f2c4118245e2efb21 (patch) | |
| tree | 8e71209fb63747c6c21679d3e067cee5f2560de1 /sound/soc | |
| parent | b4fd4ea7b628abbc721a0c6ddbb3fb3e454b2c62 (diff) | |
| parent | bb17379cf278c15574b0c1c94a76531f637970c7 (diff) | |
Merge series "ASoC: sunxi: 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: sunxi: sun4i-codec: Use devm_platform_get_and_ioremap_resource()
ASoC: sun4i-i2s: Use devm_platform_get_and_ioremap_resource()
ASoC: sunxi: sun4i-spdif: Use devm_platform_get_and_ioremap_resource()
sound/soc/sunxi/sun4i-codec.c | 3 +--
sound/soc/sunxi/sun4i-i2s.c | 3 +--
sound/soc/sunxi/sun4i-spdif.c | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
--
2.25.1
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/sunxi/sun4i-codec.c | 3 | ||||
| -rw-r--r-- | sound/soc/sunxi/sun4i-i2s.c | 3 | ||||
| -rw-r--r-- | sound/soc/sunxi/sun4i-spdif.c | 3 |
3 files changed, 3 insertions, 6 deletions
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c index 6f3d9148a185..da597e456beb 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -1709,8 +1709,7 @@ static int sun4i_codec_probe(struct platform_device *pdev) scodec->dev = &pdev->dev; - 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/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index c57feae3396e..1e9116cd365e 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -1470,8 +1470,7 @@ static int sun4i_i2s_probe(struct platform_device *pdev) return -ENOMEM; platform_set_drvdata(pdev, i2s); - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - regs = devm_ioremap_resource(&pdev->dev, res); + regs = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(regs)) return PTR_ERR(regs); diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c index 228485fe0734..a10949bf0ca1 100644 --- a/sound/soc/sunxi/sun4i-spdif.c +++ b/sound/soc/sunxi/sun4i-spdif.c @@ -518,8 +518,7 @@ static int sun4i_spdif_probe(struct platform_device *pdev) host->cpu_dai_drv.name = dev_name(&pdev->dev); /* Get the addresses */ - 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); |