Merge tag 'qcom-drivers-for-5.6' of https://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / drivers / memory / mvebu-devbus.c

diff --git a/drivers/memory/mvebu-devbus.c b/drivers/memory/mvebu-devbus.c
index 095f8a3b2cfcca0033ec4078f9b294e95daf3db4..886aea5872762e305f20ebd6fa12acf5f4755a10 100644 (file)
--- a/drivers/memory/mvebu-devbus.c
+++ b/drivers/memory/mvebu-devbus.c
@@ -267,7 +267,6 @@ static int mvebu_devbus_probe(struct platform_device *pdev)
        struct devbus_read_params r;
        struct devbus_write_params w;
        struct devbus *devbus;
-       struct resource *res;
        struct clk *clk;
        unsigned long rate;
        int err;
@@ -277,8 +276,7 @@ static int mvebu_devbus_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        devbus->dev = dev;
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       devbus->base = devm_ioremap_resource(&pdev->dev, res);
+       devbus->base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(devbus->base))
                return PTR_ERR(devbus->base);