Merge tag 'xfs-5.5-merge-17' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

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

diff --git a/drivers/dma/zx_dma.c b/drivers/dma/zx_dma.c
index 9f4436f7c9149621b6b0db6e308456bbdaff950d..5fe2e8b9a7b80a63f1b34f8d96138c388b04db63 100644 (file)
--- a/drivers/dma/zx_dma.c
+++ b/drivers/dma/zx_dma.c
@@ -754,18 +754,13 @@ static struct dma_chan *zx_of_dma_simple_xlate(struct of_phandle_args *dma_spec,
 static int zx_dma_probe(struct platform_device *op)
 {
        struct zx_dma_dev *d;
-       struct resource *iores;
        int i, ret = 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;
 
-       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);
 
@@ -894,7 +889,6 @@ static int zx_dma_remove(struct platform_device *op)
                list_del(&c->vc.chan.device_node);
        }
        clk_disable_unprepare(d->clk);
-       dmam_pool_destroy(d->pool);
 
        return 0;
 }