spi: Export OF interfaces.

Commit Message

Pantelis Antoniou Oct. 31, 2012, 3:57 p.m. UTC

Export an interface that other in-kernel users can utilize.

Signed-off-by: Pantelis Antoniou <[e-mail]>
---
 drivers/spi/spi.c       | 31 +++++++++++++++++++++++--------
 include/linux/spi/spi.h | 18 ++++++++++++++++++
 2 files changed, 41 insertions(+), 8 deletions(-)

Comments

Grant Likely Nov. 15, 2012, 4:32 p.m. UTC | #1

On Wed, 31 Oct 2012 17:57:33 +0200, Pantelis Antoniou <[e-mail]> wrote:
> Export an interface that other in-kernel users can utilize.
> 
> Signed-off-by: Pantelis Antoniou <[e-mail]>

I'm not going to apply this before an in-kernel user exists for this. I
know it's part of the whole runtime population of the device tree stuff
and I don't think it will survive in it's current form by the time we're
done.

g.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 84c2861..f8de2f2 100644
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -801,14 +801,17 @@  err_init_queue:
 /*-------------------------------------------------------------------------*/
 
 #if defined(CONFIG_OF) && !defined(CONFIG_SPARC)
+
 /**
- * of_register_spi_devices() - Register child devices onto the SPI bus
+ * of_register_node_spi_devices() - Register child devices onto the SPI bus
  * @master:	Pointer to spi_master device
+ * @parent_node: Pointer to the device node containg the devices
  *
  * Registers an spi_device for each child node of master node which has a 'reg'
  * property.
  */
-static void of_register_spi_devices(struct spi_master *master)
+void of_register_node_spi_devices(struct spi_master *master,
+		struct device_node *parent_node)
 {
 	struct spi_device *spi;
 	struct device_node *nc;
@@ -816,10 +819,10 @@  static void of_register_spi_devices(struct spi_master *master)
 	int rc;
 	int len;
 
-	if (!master->dev.of_node)
+	if (!parent_node)
 		return;
 
-	for_each_child_of_node(master->dev.of_node, nc) {
+	for_each_child_of_node(parent_node, nc) {
 		/* Alloc an spi_device */
 		spi = spi_alloc_device(master);
 		if (!spi) {
@@ -884,8 +887,20 @@  static void of_register_spi_devices(struct spi_master *master)
 
 	}
 }
-#else
-static void of_register_spi_devices(struct spi_master *master) { }
+EXPORT_SYMBOL_GPL(of_register_node_spi_devices);
+
+/**
+ * of_register_spi_devices() - Register child devices onto the SPI bus
+ * @master:	Pointer to spi_master device
+ *
+ * Registers an spi_device for each child node of master node which has a 'reg'
+ * property.
+ */
+void of_register_spi_devices(struct spi_master *master)
+{
+	of_register_node_spi_devices(master, master->dev.of_node);
+}
+EXPORT_SYMBOL_GPL(of_register_spi_devices);
 #endif
 
 static void spi_master_release(struct device *dev)
@@ -896,12 +911,12 @@  static void spi_master_release(struct device *dev)
 	kfree(master);
 }
 
-static struct class spi_master_class = {
+struct class spi_master_class = {
 	.name		= "spi_master",
 	.owner		= THIS_MODULE,
 	.dev_release	= spi_master_release,
 };
-
+EXPORT_SYMBOL_GPL(spi_master_class);
 
 
 /**
diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index fa702ae..618aa5e 100644
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -30,6 +30,8 @@ 
  */
 extern struct bus_type spi_bus_type;
 
+extern struct class spi_master_class;
+
 /**
  * struct spi_device - Master side proxy for an SPI slave device
  * @dev: Driver model representation of the device.
@@ -856,4 +858,20 @@  spi_unregister_device(struct spi_device *spi)
 extern const struct spi_device_id *
 spi_get_device_id(const struct spi_device *sdev);
 
+#if defined(CONFIG_OF) && !defined(CONFIG_SPARC)
+
+void of_register_node_spi_devices(struct spi_master *master,
+		struct device_node *parent_node);
+
+void of_register_spi_devices(struct spi_master *master);
+
+#else
+
+static inline void of_register_node_spi_devices(struct spi_master *master,
+		struct device_node *parent_node) { }
+
+static inline void of_register_spi_devices(struct spi_master *master) { }
+
+#endif
+
 #endif /* __LINUX_SPI_H */