Unverified Commit 3f3b063e authored by Mark Brown's avatar Mark Brown
Browse files

spi: Unify and simplify fwnode related checks 

Merge series from Andy Shevchenko <andriy.shevchenko@linux.intel.com>:

A couple of cleanups on top of recently added change.
parents b7cc2818 0020c9d2

drivers/spi/spi.c

+18 −23
Original line number Diff line number Diff line
@@ -410,29 +410,21 @@ static int spi_probe(struct device *dev) 
{

	const struct spi_driver		*sdrv = to_spi_driver(dev->driver);

	struct spi_device		*spi = to_spi_device(dev);

	struct fwnode_handle		*fwnode = dev_fwnode(dev);

	int ret;



	ret = of_clk_set_defaults(dev->of_node, false);

	if (ret)

		return ret;



	if (dev->of_node) {

	if (is_of_node(fwnode))

		spi->irq = of_irq_get(dev->of_node, 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 dev_err_probe(dev, -EPROBE_DEFER, "Failed to get irq\n");

		if (spi->irq < 0)

			spi->irq = 0;

	}



	if (has_acpi_companion(dev) && spi->irq < 0) {

		struct acpi_device *adev = to_acpi_device_node(dev->fwnode);



		spi->irq = acpi_dev_gpio_irq_get(adev, 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)
@@ -874,15 +866,18 @@ EXPORT_SYMBOL_GPL(spi_new_device); 
 */

void spi_unregister_device(struct spi_device *spi)

{

	struct fwnode_handle *fwnode;



	if (!spi)

		return;



	if (spi->dev.of_node) {

		of_node_clear_flag(spi->dev.of_node, OF_POPULATED);

		of_node_put(spi->dev.of_node);

	fwnode = dev_fwnode(&spi->dev);

	if (is_of_node(fwnode)) {

		of_node_clear_flag(to_of_node(fwnode), OF_POPULATED);

		of_node_put(to_of_node(fwnode));

	} else if (is_acpi_device_node(fwnode)) {

		acpi_device_clear_enumerated(to_acpi_device_node(fwnode));

	}

	if (ACPI_COMPANION(&spi->dev))

		acpi_device_clear_enumerated(ACPI_COMPANION(&spi->dev));

	device_remove_software_node(&spi->dev);

	device_del(&spi->dev);

	spi_cleanup(spi);
@@ -1059,7 +1054,7 @@ static void spi_toggle_csgpiod(struct spi_device *spi, u8 idx, bool enable, bool 
	 * ambiguity. That's why we use enable, that takes SPI_CS_HIGH

	 * into account.

	 */

	if (has_acpi_companion(&spi->dev))

	if (is_acpi_device_node(dev_fwnode(&spi->dev)))

		gpiod_set_value_cansleep(spi_get_csgpiod(spi, idx), !enable);

	else

		/* Polarity handled by GPIO library */
@@ -4841,7 +4836,7 @@ extern struct notifier_block spi_of_notifier; 
#if IS_ENABLED(CONFIG_ACPI)

static int spi_acpi_controller_match(struct device *dev, const void *data)

{

	return ACPI_COMPANION(dev->parent) == data;

	return device_match_acpi_dev(dev->parent, data);

}



struct spi_controller *acpi_spi_find_controller_by_adev(struct acpi_device *adev)