Unverified Commit 0020c9d2 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

spi: Deduplicate deferred probe checks in spi_probe() 



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

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20241208195635.1271656-3-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent b6ffe0e6

drivers/spi/spi.c

+6 −11
Original line number Diff line number Diff line
@@ -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;

		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)