Merge tag 'riscv/for-v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv...

[sfrench/cifs-2.6.git] / drivers / spi / spi-rb4xx.c

diff --git a/drivers/spi/spi-rb4xx.c b/drivers/spi/spi-rb4xx.c
index 51f03d977ad62351cc5aeedf614c27b073b2e30c..4c9620e0d18ccdbb1555c65eb4851c44ea1bb513 100644 (file)
--- a/drivers/spi/spi-rb4xx.c
+++ b/drivers/spi/spi-rb4xx.c
@@ -135,12 +135,10 @@ static int rb4xx_spi_probe(struct platform_device *pdev)
        struct spi_master *master;
        struct clk *ahb_clk;
        struct rb4xx_spi *rbspi;
-       struct resource *r;
        int err;
        void __iomem *spi_base;
 
-       r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       spi_base = devm_ioremap_resource(&pdev->dev, r);
+       spi_base = devm_platform_ioremap_resource(pdev, 0);
        if (IS_ERR(spi_base))
                return PTR_ERR(spi_base);