diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-09 16:55:20 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-09 16:55:20 +0300 |
| commit | bb831786117519fc16dfd3eaa7b84e4f6bbb8d99 (patch) | |
| tree | 18f8333bbaf6918a0246113eeb0f056011e436f2 /sound/soc/tegra/tegra20_das.c | |
| parent | 6652ddbb5d83ecfc2591b92be063519714e40ebf (diff) | |
| parent | 6fa5963c37a2e3335eba0b7455e35a01318ebc15 (diff) | |
| download | linux-bb831786117519fc16dfd3eaa7b84e4f6bbb8d99.tar.xz | |
Merge branch 'asoc-5.4' into asoc-next
Diffstat (limited to 'sound/soc/tegra/tegra20_das.c')
| -rw-r--r-- | sound/soc/tegra/tegra20_das.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/tegra/tegra20_das.c b/sound/soc/tegra/tegra20_das.c index 10f9c3b19c88..1070b2710d5e 100644 --- a/sound/soc/tegra/tegra20_das.c +++ b/sound/soc/tegra/tegra20_das.c @@ -120,7 +120,6 @@ static const struct regmap_config tegra20_das_regmap_config = { static int tegra20_das_probe(struct platform_device *pdev) { - struct resource *res; void __iomem *regs; int ret = 0; @@ -134,8 +133,7 @@ static int tegra20_das_probe(struct platform_device *pdev) } das->dev = &pdev->dev; - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - regs = devm_ioremap_resource(&pdev->dev, res); + regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(regs)) { ret = PTR_ERR(regs); goto err; |