spi: mpc5xxx-psc: Correct error check for devm_platform_get_and_ioremap_resource()

devm_platform_get_and_ioremap_resource() may return pointer or error
pointer, never the NULL. Correct error check for it.

Fixes: 60a6c8257f41 ("spi: mpc5xxx-psc: Use platform resources instead of parsing DT properties")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230306183115.87314-2-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-mpc512x-psc.c b/drivers/spi/spi-mpc512x-psc.c
index 5bdfe4a740e961766b7736f9ccb7ee6747a8f81a..a2ea24a63cb41293f36c32c1d4f54928fe966abc 100644 (file)
--- a/drivers/spi/spi-mpc512x-psc.c
+++ b/drivers/spi/spi-mpc512x-psc.c
@@ -483,8 +483,8 @@ static int mpc512x_psc_spi_of_probe(struct platform_device *pdev)
        master->dev.of_node = dev->of_node;
 
        tempp = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
-       if (!tempp)
-               return dev_err_probe(dev, -EFAULT, "could not ioremap I/O port range\n");
+       if (IS_ERR(tempp))
+               return dev_err_probe(dev, PTR_ERR(tempp), "could not ioremap I/O port range\n");
        mps->psc = tempp;
        mps->fifo =
                (struct mpc512x_psc_fifo *)(tempp + sizeof(struct mpc52xx_psc));

diff --git a/drivers/spi/spi-mpc52xx-psc.c b/drivers/spi/spi-mpc52xx-psc.c
index 95a4a511c38810b5fe404beacb758af7a8f60294..1bf728f4d7661d7ee6d5b61b4a12b6b0ec28fb97 100644 (file)
--- a/drivers/spi/spi-mpc52xx-psc.c
+++ b/drivers/spi/spi-mpc52xx-psc.c
@@ -321,8 +321,9 @@ static int mpc52xx_psc_spi_of_probe(struct platform_device *pdev)
        master->dev.of_node = dev->of_node;
 
        mps->psc = devm_platform_get_and_ioremap_resource(pdev, 0, NULL);
-       if (!mps->psc)
-               return dev_err_probe(dev, -EFAULT, "could not ioremap I/O port range\n");
+       if (IS_ERR(mps->psc))
+               return dev_err_probe(dev, PTR_ERR(mps->psc), "could not ioremap I/O port range\n");
+
        /* On the 5200, fifo regs are immediately ajacent to the psc regs */
        mps->fifo = ((void __iomem *)mps->psc) + sizeof(struct mpc52xx_psc);