diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-15 11:31:44 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-15 11:31:44 +0200 |
| commit | a54f8485727e6e85b5dfe1d9708b80d13fe8bf5f (patch) | |
| tree | 9d38878259b080ffa01e1e398094906ee4e988fe /sound/soc/codecs/sirf-audio-codec.c | |
| parent | Merge branch 'asoc-5.3' into asoc-linus (diff) | |
| parent | ASoC: sdm845: remove unneeded semicolon (diff) | |
| download | linux-a54f8485727e6e85b5dfe1d9708b80d13fe8bf5f.tar.xz linux-a54f8485727e6e85b5dfe1d9708b80d13fe8bf5f.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); |