TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

spi: Deduplicate deferred probe checks in spi_probe()

Browse Source 
Deduplicate deferred probe checks in spi_probe() and enable
the error message for ACPI case as well.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20241208195635.1271656-3-andriy.shevchenko@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Andy Shevchenko
2024-12-08 18:03:17 +02:00
committed by Mark Brown
parent b6ffe0e614
commit 0020c9d2d5
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/spi/spi.c
+6 -11
View File
@@ -417,19 +417,14 @@ static int spi_probe(struct device *dev)
if (ret)
return ret;
if (is_of_node(fwnode)) {
if (is_of_node(fwnode))
spi->irq = of_irq_get(dev->of_node, 0);
if (spi->irq == -EPROBE_DEFER)
return dev_err_probe(dev, -EPROBE_DEFER, "Failed to get irq\n");
if (spi->irq < 0)
spi->irq = 0;
} else if (is_acpi_device_node(fwnode) && spi->irq < 0) {
else if (is_acpi_device_node(fwnode) && spi->irq < 0)
spi->irq = acpi_dev_gpio_irq_get(to_acpi_device_node(fwnode), 0);
if (spi->irq == -EPROBE_DEFER)
return -EPROBE_DEFER;
if (spi->irq < 0)
spi->irq = 0;
}
if (spi->irq == -EPROBE_DEFER)
return dev_err_probe(dev, spi->irq, "Failed to get irq\n");
if (spi->irq < 0)
spi->irq = 0;
ret = dev_pm_domain_attach(dev, true);
if (ret)