Merge branch 'spi-5.4' into spi-next

1 files changed, 1 insertions, 4 deletions

diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c
index 7c41e4e82849..c36587b42e95 100644
--- a/drivers/spi/spi-cadence.c
+++ b/drivers/spi/spi-cadence.c
@@ -474,7 +474,6 @@ static int cdns_spi_probe(struct platform_device *pdev)
         int ret = 0, irq;
         struct spi_master *master;
         struct cdns_spi *xspi;
-        struct resource *res;
         u32 num_cs;
 
         master = spi_alloc_master(&pdev->dev, sizeof(*xspi));
@@ -485,8 +484,7 @@ static int cdns_spi_probe(struct platform_device *pdev)
         master->dev.of_node = pdev->dev.of_node;
         platform_set_drvdata(pdev, master);
 
-        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-        xspi->regs = devm_ioremap_resource(&pdev->dev, res);
+        xspi->regs = devm_platform_ioremap_resource(pdev, 0);
         if (IS_ERR(xspi->regs)) {
                 ret = PTR_ERR(xspi->regs);
                 goto remove_master;
@@ -540,7 +538,6 @@ static int cdns_spi_probe(struct platform_device *pdev)
         irq = platform_get_irq(pdev, 0);
         if (irq <= 0) {
                 ret = -ENXIO;
-                dev_err(&pdev->dev, "irq number is invalid\n");
                 goto clk_dis_all;
         }