Merge branch 'spi-5.4' into spi-next

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/spi/spi-axi-spi-engine.c b/drivers/spi/spi-axi-spi-engine.c
index 3b1833e6c7ad..74842f6019ed 100644
--- a/drivers/spi/spi-axi-spi-engine.c
+++ b/drivers/spi/spi-axi-spi-engine.c
@@ -460,7 +460,6 @@ static int spi_engine_probe(struct platform_device *pdev)
         struct spi_engine *spi_engine;
         struct spi_master *master;
         unsigned int version;
-        struct resource *res;
         int irq;
         int ret;
 
@@ -480,8 +479,7 @@ static int spi_engine_probe(struct platform_device *pdev)
 
         spin_lock_init(&spi_engine->lock);
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        spi_engine->base = devm_ioremap_resource(&pdev->dev, res);
+        spi_engine->base = devm_platform_ioremap_resource(pdev, 0);
         if (IS_ERR(spi_engine->base)) {
                 ret = PTR_ERR(spi_engine->base);
                 goto err_put_master;