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/codecs/sirf-audio-codec.c | |
| parent | Merge branch 'asoc-5.3' into asoc-linus (diff) | |
| parent | ASoC: hdmi-codec: Add an op to set callback function for plug event (diff) | |
| download | linux-dev-bb831786117519fc16dfd3eaa7b84e4f6bbb8d99.tar.xz linux-dev-bb831786117519fc16dfd3eaa7b84e4f6bbb8d99.zip | |
Merge branch 'asoc-5.4' into asoc-next
Diffstat (limited to 'sound/soc/codecs/sirf-audio-codec.c')
| -rw-r--r-- | sound/soc/codecs/sirf-audio-codec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/codecs/sirf-audio-codec.c b/sound/soc/codecs/sirf-audio-codec.c index 9009a7407b7a..a061d78473ac 100644 --- a/sound/soc/codecs/sirf-audio-codec.c +++ b/sound/soc/codecs/sirf-audio-codec.c @@ -459,7 +459,6 @@ static int sirf_audio_codec_driver_probe(struct platform_device *pdev) int ret; struct sirf_audio_codec *sirf_audio_codec; void __iomem *base; - struct resource *mem_res; sirf_audio_codec = devm_kzalloc(&pdev->dev, sizeof(struct sirf_audio_codec), GFP_KERNEL); @@ -468,8 +467,7 @@ static int sirf_audio_codec_driver_probe(struct platform_device *pdev) platform_set_drvdata(pdev, sirf_audio_codec); - mem_res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - base = devm_ioremap_resource(&pdev->dev, mem_res); + base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(base)) return PTR_ERR(base); |