platform/x86: serial-multi-instantiate: Improve dev_err_probe() messaging

Drop duplicate print of returned value in the messages and use pattern
return dev_err_probe(...) where it's possible.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20220709211653.18938-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/drivers/platform/x86/serial-multi-instantiate.c b/drivers/platform/x86/serial-multi-instantiate.c
index a1e04be858c5a21c58e2eb20d0c5da817036bca0..970ede0ff002ec670cbac31a2e1a817d10a82534 100644 (file)
--- a/drivers/platform/x86/serial-multi-instantiate.c
+++ b/drivers/platform/x86/serial-multi-instantiate.c
@@ -61,10 +61,9 @@ static int smi_get_irq(struct platform_device *pdev, struct acpi_device *adev,
        default:
                return 0;
        }
-
        if (ret < 0)
-               dev_err_probe(&pdev->dev, ret, "Error requesting irq at index %d: %d\n",
-                             inst->irq_idx, ret);
+               return dev_err_probe(&pdev->dev, ret, "Error requesting irq at index %d\n",
+                                    inst->irq_idx);
 
        return ret;
 }
@@ -112,9 +111,8 @@ static int smi_spi_probe(struct platform_device *pdev, struct smi *smi,
 
                spi_dev = acpi_spi_device_alloc(NULL, adev, i);
                if (IS_ERR(spi_dev)) {
-                       ret = PTR_ERR(spi_dev);
-                       dev_err_probe(dev, ret, "failed to allocate SPI device %s from ACPI: %d\n",
-                                     dev_name(&adev->dev), ret);
+                       ret = dev_err_probe(dev, PTR_ERR(spi_dev), "failed to allocate SPI device %s from ACPI\n",
+                                           dev_name(&adev->dev));
                        goto error;
                }
 
@@ -135,9 +133,8 @@ static int smi_spi_probe(struct platform_device *pdev, struct smi *smi,
 
                ret = spi_add_device(spi_dev);
                if (ret) {
-                       dev_err_probe(&ctlr->dev, ret,
-                                     "failed to add SPI device %s from ACPI: %d\n",
-                                     dev_name(&adev->dev), ret);
+                       dev_err_probe(&ctlr->dev, ret, "failed to add SPI device %s from ACPI\n",
+                                     dev_name(&adev->dev));
                        spi_dev_put(spi_dev);
                        goto error;
                }