Unverified Commit 037f8d89 authored by Oder Chiou's avatar Oder Chiou Committed by Mark Brown
Browse files

spi: change of_find_spi_controller_by_node() gating to CONFIG_OF 



Currently, the helper of_find_spi_controller_by_node() is gated under
CONFIG_OF_DYNAMIC. This prevents drivers from using it in all CONFIG_OF
configurations.

This patch moves the gating to CONFIG_OF, keeping the inline fallback
returning NULL when Device Tree support is disabled.

Signed-off-by: default avatarOder Chiou <oder_chiou@realtek.com>
Link: https://patch.msgid.link/6d8ae977d9f4726ea23ad5382638750593f9a2e4.1767148150.git.oder_chiou@realtek.com


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

drivers/spi/spi.c

+11 −9
Original line number Diff line number Diff line
@@ -4761,15 +4761,7 @@ EXPORT_SYMBOL_GPL(spi_write_then_read); 


/*-------------------------------------------------------------------------*/



#if IS_ENABLED(CONFIG_OF_DYNAMIC)

/* Must call put_device() when done with returned spi_device device */

static struct spi_device *of_find_spi_device_by_node(struct device_node *node)

{

	struct device *dev = bus_find_device_by_of_node(&spi_bus_type, node);



	return dev ? to_spi_device(dev) : NULL;

}



#if IS_ENABLED(CONFIG_OF)

/* The spi controllers are not using spi_bus, so we find it with another way */

struct spi_controller *of_find_spi_controller_by_node(struct device_node *node)

{
@@ -4785,6 +4777,16 @@ struct spi_controller *of_find_spi_controller_by_node(struct device_node *node) 
	return container_of(dev, struct spi_controller, dev);

}

EXPORT_SYMBOL_GPL(of_find_spi_controller_by_node);

#endif



#if IS_ENABLED(CONFIG_OF_DYNAMIC)

/* Must call put_device() when done with returned spi_device device */

static struct spi_device *of_find_spi_device_by_node(struct device_node *node)

{

	struct device *dev = bus_find_device_by_of_node(&spi_bus_type, node);



	return dev ? to_spi_device(dev) : NULL;

}



static int of_spi_notify(struct notifier_block *nb, unsigned long action,

			 void *arg)

include/linux/spi/spi.h

+1 −1
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ extern int devm_spi_register_controller(struct device *dev, 
					struct spi_controller *ctlr);

extern void spi_unregister_controller(struct spi_controller *ctlr);



#if IS_ENABLED(CONFIG_OF_DYNAMIC)

#if IS_ENABLED(CONFIG_OF)

extern struct spi_controller *of_find_spi_controller_by_node(struct device_node *node);

#else

static inline struct spi_controller *of_find_spi_controller_by_node(struct device_node *node)