Commit 14a9aa99 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Hans de Goede

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: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20220709211653.18938-3-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 8b50c48d
...@@ -61,10 +61,9 @@ static int smi_get_irq(struct platform_device *pdev, struct acpi_device *adev, ...@@ -61,10 +61,9 @@ static int smi_get_irq(struct platform_device *pdev, struct acpi_device *adev,
default: default:
return 0; return 0;
} }
if (ret < 0) if (ret < 0)
dev_err_probe(&pdev->dev, ret, "Error requesting irq at index %d: %d\n", return dev_err_probe(&pdev->dev, ret, "Error requesting irq at index %d\n",
inst->irq_idx, ret); inst->irq_idx);
return ret; return ret;
} }
...@@ -112,9 +111,8 @@ static int smi_spi_probe(struct platform_device *pdev, struct smi *smi, ...@@ -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); spi_dev = acpi_spi_device_alloc(NULL, adev, i);
if (IS_ERR(spi_dev)) { if (IS_ERR(spi_dev)) {
ret = PTR_ERR(spi_dev); ret = dev_err_probe(dev, PTR_ERR(spi_dev), "failed to allocate SPI device %s from ACPI\n",
dev_err_probe(dev, ret, "failed to allocate SPI device %s from ACPI: %d\n", dev_name(&adev->dev));
dev_name(&adev->dev), ret);
goto error; goto error;
} }
...@@ -135,9 +133,8 @@ static int smi_spi_probe(struct platform_device *pdev, struct smi *smi, ...@@ -135,9 +133,8 @@ static int smi_spi_probe(struct platform_device *pdev, struct smi *smi,
ret = spi_add_device(spi_dev); ret = spi_add_device(spi_dev);
if (ret) { if (ret) {
dev_err_probe(&ctlr->dev, ret, dev_err_probe(&ctlr->dev, ret, "failed to add SPI device %s from ACPI\n",
"failed to add SPI device %s from ACPI: %d\n", dev_name(&adev->dev));
dev_name(&adev->dev), ret);
spi_dev_put(spi_dev); spi_dev_put(spi_dev);
goto error; goto error;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment