aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/meson/axg-tdm-formatter.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/meson/axg-tdm-formatter.c')
-rw-r--r--sound/soc/meson/axg-tdm-formatter.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/soc/meson/axg-tdm-formatter.c b/sound/soc/meson/axg-tdm-formatter.c
index 2e498201139f..358c8c0d861c 100644
--- a/sound/soc/meson/axg-tdm-formatter.c
+++ b/sound/soc/meson/axg-tdm-formatter.c
@@ -253,7 +253,6 @@ int axg_tdm_formatter_probe(struct platform_device *pdev)
253 struct device *dev = &pdev->dev; 253 struct device *dev = &pdev->dev;
254 const struct axg_tdm_formatter_driver *drv; 254 const struct axg_tdm_formatter_driver *drv;
255 struct axg_tdm_formatter *formatter; 255 struct axg_tdm_formatter *formatter;
256 struct resource *res;
257 void __iomem *regs; 256 void __iomem *regs;
258 int ret; 257 int ret;
259 258
@@ -269,8 +268,7 @@ int axg_tdm_formatter_probe(struct platform_device *pdev)
269 platform_set_drvdata(pdev, formatter); 268 platform_set_drvdata(pdev, formatter);
270 formatter->drv = drv; 269 formatter->drv = drv;
271 270
272 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 271 regs = devm_platform_ioremap_resource(pdev, 0);
273 regs = devm_ioremap_resource(dev, res);
274 if (IS_ERR(regs)) 272 if (IS_ERR(regs))
275 return PTR_ERR(regs); 273 return PTR_ERR(regs);
276 274
@@ -327,7 +325,7 @@ int axg_tdm_formatter_probe(struct platform_device *pdev)
327 } 325 }
328 326
329 /* Formatter dedicated reset line */ 327 /* Formatter dedicated reset line */
330 formatter->reset = reset_control_get_optional_exclusive(dev, NULL); 328 formatter->reset = devm_reset_control_get_optional_exclusive(dev, NULL);
331 if (IS_ERR(formatter->reset)) { 329 if (IS_ERR(formatter->reset)) {
332 ret = PTR_ERR(formatter->reset); 330 ret = PTR_ERR(formatter->reset);
333 if (ret != -EPROBE_DEFER) 331 if (ret != -EPROBE_DEFER)