Merge branch 'spi-5.4' into spi-next

1 files changed, 1 insertions, 3 deletions

diff --git a/drivers/spi/spi-oc-tiny.c b/drivers/spi/spi-oc-tiny.c
index bbc4ba66571f..e2331eb7b47a 100644
--- a/drivers/spi/spi-oc-tiny.c
+++ b/drivers/spi/spi-oc-tiny.c
@@ -240,7 +240,6 @@ static int tiny_spi_probe(struct platform_device *pdev)
         struct tiny_spi_platform_data *platp = dev_get_platdata(&pdev->dev);
         struct tiny_spi *hw;
         struct spi_master *master;
-        struct resource *res;
         unsigned int i;
         int err = -ENODEV;
 
@@ -264,8 +263,7 @@ static int tiny_spi_probe(struct platform_device *pdev)
         hw->bitbang.txrx_bufs = tiny_spi_txrx_bufs;
 
         /* find and map our resources */
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        hw->base = devm_ioremap_resource(&pdev->dev, res);
+        hw->base = devm_platform_ioremap_resource(pdev, 0);
         if (IS_ERR(hw->base)) {
                 err = PTR_ERR(hw->base);
                 goto exit;