Merge tag 'sound-5.5-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound

[linux.git] / drivers / dma / k3dma.c

diff --git a/drivers/dma/k3dma.c b/drivers/dma/k3dma.c
index 4b36c8810517631f091ce9897d68a8bbf05e59b7..adecea51814f0a2cb6a26f8593bbf86e9c931e3d 100644 (file)
--- a/drivers/dma/k3dma.c
+++ b/drivers/dma/k3dma.c
@@ -835,13 +835,8 @@ static int k3_dma_probe(struct platform_device *op)
        const struct k3dma_soc_data *soc_data;
        struct k3_dma_dev *d;
        const struct of_device_id *of_id;
-       struct resource *iores;
        int i, ret, irq = 0;
 
-       iores = platform_get_resource(op, IORESOURCE_MEM, 0);
-       if (!iores)
-               return -EINVAL;
-
        d = devm_kzalloc(&op->dev, sizeof(*d), GFP_KERNEL);
        if (!d)
                return -ENOMEM;
@@ -850,7 +845,7 @@ static int k3_dma_probe(struct platform_device *op)
        if (!soc_data)
                return -EINVAL;
 
-       d->base = devm_ioremap_resource(&op->dev, iores);
+       d->base = devm_platform_ioremap_resource(op, 0);
        if (IS_ERR(d->base))
                return PTR_ERR(d->base);