spi: pxa2xx: Switch to use dev_err_probe()

Switch to use dev_err_probe() to simplify the error path and
unify a message template.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://msgid.link/r/20240326181027.1418989-4-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi-pxa2xx.c b/drivers/spi/spi-pxa2xx.c
index 6c2a14418972be8e9e59a093b77ed5369f07b1e6..1d43346b4436c719c8c56f026810bb0b4d5d65b4 100644 (file)
--- a/drivers/spi/spi-pxa2xx.c
+++ b/drivers/spi/spi-pxa2xx.c
@@ -1435,20 +1435,16 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
        platform_info = dev_get_platdata(dev);
        if (!platform_info) {
                platform_info = pxa2xx_spi_init_pdata(pdev);
-               if (IS_ERR(platform_info)) {
-                       dev_err(&pdev->dev, "missing platform data\n");
-                       return PTR_ERR(platform_info);
-               }
+               if (IS_ERR(platform_info))
+                       return dev_err_probe(dev, PTR_ERR(platform_info), "missing platform data\n");
        }
 
        ssp = pxa_ssp_request(pdev->id, pdev->name);
        if (!ssp)
                ssp = &platform_info->ssp;
 
-       if (!ssp->mmio_base) {
-               dev_err(&pdev->dev, "failed to get SSP\n");
-               return -ENODEV;
-       }
+       if (!ssp->mmio_base)
+               return dev_err_probe(dev, -ENODEV, "failed to get SSP\n");
 
        if (platform_info->is_target)
                controller = devm_spi_alloc_target(dev, sizeof(*drv_data));
@@ -1456,8 +1452,7 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
                controller = devm_spi_alloc_host(dev, sizeof(*drv_data));
 
        if (!controller) {
-               dev_err(&pdev->dev, "cannot alloc spi_controller\n");
-               status = -ENOMEM;
+               status = dev_err_probe(dev, -ENOMEM, "cannot alloc spi_controller\n");
                goto out_error_controller_alloc;
        }
        drv_data = spi_controller_get_devdata(controller);
@@ -1511,7 +1506,7 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
        status = request_irq(ssp->irq, ssp_int, IRQF_SHARED, dev_name(dev),
                        drv_data);
        if (status < 0) {
-               dev_err(&pdev->dev, "cannot get IRQ %d\n", ssp->irq);
+               dev_err_probe(dev, status, "cannot get IRQ %d\n", ssp->irq);
                goto out_error_controller_alloc;
        }
 
@@ -1627,7 +1622,7 @@ static int pxa2xx_spi_probe(struct platform_device *pdev)
        platform_set_drvdata(pdev, drv_data);
        status = spi_register_controller(controller);
        if (status) {
-               dev_err(&pdev->dev, "problem registering SPI controller\n");
+               dev_err_probe(dev, status, "problem registering SPI controller\n");
                goto out_error_pm_runtime_enabled;
        }