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/atmel/atmel-i2s.c | |
| parent | c073a58a7ec59145f8a0b87403d559645bfd9edb (diff) | |
| parent | 6a7f5bd6185e1c86256d5e52c3bb7a4d390d6e19 (diff) | |
Merge remote-tracking branch 'asoc/for-5.14' into asoc-next
Diffstat (limited to 'sound/soc/atmel/atmel-i2s.c')
| -rw-r--r-- | sound/soc/atmel/atmel-i2s.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/soc/atmel/atmel-i2s.c b/sound/soc/atmel/atmel-i2s.c index e5c4625b7771..6b3d9c05eaf2 100644 --- a/sound/soc/atmel/atmel-i2s.c +++ b/sound/soc/atmel/atmel-i2s.c @@ -629,8 +629,7 @@ static int atmel_i2s_probe(struct platform_device *pdev) dev->caps = match->data; /* Map I/O registers. */ - mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); - base = devm_ioremap_resource(&pdev->dev, mem); + base = devm_platform_get_and_ioremap_resource(pdev, 0, &mem); if (IS_ERR(base)) return PTR_ERR(base); |