diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-09 14:55:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-09 14:55:20 +0100 |
| commit | bb831786117519fc16dfd3eaa7b84e4f6bbb8d99 (patch) | |
| tree | 18f8333bbaf6918a0246113eeb0f056011e436f2 /sound/soc/sunxi/sun8i-codec.c | |
| parent | 6652ddbb5d83ecfc2591b92be063519714e40ebf (diff) | |
| parent | 6fa5963c37a2e3335eba0b7455e35a01318ebc15 (diff) | |
| download | lwn-bb831786117519fc16dfd3eaa7b84e4f6bbb8d99.tar.gz lwn-bb831786117519fc16dfd3eaa7b84e4f6bbb8d99.zip | |
Merge branch 'asoc-5.4' into asoc-next
Diffstat (limited to 'sound/soc/sunxi/sun8i-codec.c')
| -rw-r--r-- | sound/soc/sunxi/sun8i-codec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c index 0e0e8ebaa571..55798bc8eae2 100644 --- a/sound/soc/sunxi/sun8i-codec.c +++ b/sound/soc/sunxi/sun8i-codec.c @@ -533,7 +533,6 @@ static const struct regmap_config sun8i_codec_regmap_config = { static int sun8i_codec_probe(struct platform_device *pdev) { - struct resource *res_base; struct sun8i_codec *scodec; void __iomem *base; int ret; @@ -556,8 +555,7 @@ static int sun8i_codec_probe(struct platform_device *pdev) return PTR_ERR(scodec->clk_bus); } - res_base = platform_get_resource(pdev, IORESOURCE_MEM, 0); - base = devm_ioremap_resource(&pdev->dev, res_base); + base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(base)) { dev_err(&pdev->dev, "Failed to map the registers\n"); return PTR_ERR(base); |