summaryrefslogtreecommitdiffstats
path: root/sound/soc/meson/axg-spdifin.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2019-09-09 15:55:20 +0200
committerMark Brown <broonie@kernel.org>2019-09-09 15:55:20 +0200
commitbb831786117519fc16dfd3eaa7b84e4f6bbb8d99 (patch)
tree18f8333bbaf6918a0246113eeb0f056011e436f2 /sound/soc/meson/axg-spdifin.c
parentMerge branch 'asoc-5.3' into asoc-linus (diff)
parentASoC: hdmi-codec: Add an op to set callback function for plug event (diff)
downloadlinux-bb831786117519fc16dfd3eaa7b84e4f6bbb8d99.tar.xz
linux-bb831786117519fc16dfd3eaa7b84e4f6bbb8d99.zip
Merge branch 'asoc-5.4' into asoc-next
Diffstat (limited to 'sound/soc/meson/axg-spdifin.c')
-rw-r--r--sound/soc/meson/axg-spdifin.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/meson/axg-spdifin.c b/sound/soc/meson/axg-spdifin.c
index 01b2035fa841..d0d09f945b48 100644
--- a/sound/soc/meson/axg-spdifin.c
+++ b/sound/soc/meson/axg-spdifin.c
@@ -453,7 +453,6 @@ static int axg_spdifin_probe(struct platform_device *pdev)
struct device *dev = &pdev->dev;
struct axg_spdifin *priv;
struct snd_soc_dai_driver *dai_drv;
- struct resource *res;
void __iomem *regs;
int ret;
@@ -468,8 +467,7 @@ static int axg_spdifin_probe(struct platform_device *pdev)
return -ENODEV;
}
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- regs = devm_ioremap_resource(dev, res);
+ regs = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(regs))
return PTR_ERR(regs);