Merge branch 'asoc-5.3' into asoc-5.4

[linux-2.6-block.git] / sound / soc / fsl / imx-audmux.c

diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
index 16ede3b5cb3221b491e9d139e3a684431621f7d8..3ce85a43e08f23a0a5eae2fd833d54edab9eb247 100644 (file)
--- a/sound/soc/fsl/imx-audmux.c
+++ b/sound/soc/fsl/imx-audmux.c
@@ -300,12 +300,10 @@ static int imx_audmux_parse_dt_defaults(struct platform_device *pdev,
 
 static int imx_audmux_probe(struct platform_device *pdev)
 {
-       struct resource *res;
        const struct of_device_id *of_id =
                        of_match_device(imx_audmux_dt_ids, &pdev->dev);
 
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       audmux_base = devm_ioremap_resource(&pdev->dev, res);
+       audmux_base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(audmux_base))
                return PTR_ERR(audmux_base);