[U-Boot] [PATCH v2 17/78] spi: Remove spi_setup_slave_fdt

Mario Six mario.six at gdsys.cc
Wed Dec 13 07:18:45 UTC 2017


A previous patch removed the spi_flash_probe_fdt function, which
contained the last call of the spi_setup_slave_fdt function, which is
now equally obsolete.

This patch removes the function.

Reviewed-by: Simon Glass <sjg at chromium.org>
Reviewed-by: Jagan Teki <jagan at openedev.com>
Signed-off-by: Mario Six <mario.six at gdsys.cc>
---

v1 -> v2:
None

---
 drivers/spi/spi-uclass.c | 16 ----------------
 include/spi.h            | 13 -------------
 2 files changed, 29 deletions(-)

diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c
index e06a603ab1..6db0eb02b4 100644
--- a/drivers/spi/spi-uclass.c
+++ b/drivers/spi/spi-uclass.c
@@ -348,22 +348,6 @@ err:
 }

 /* Compatibility function - to be removed */
-struct spi_slave *spi_setup_slave_fdt(const void *blob, int node,
-				      int bus_node)
-{
-	struct udevice *bus, *dev;
-	int ret;
-
-	ret = uclass_get_device_by_of_offset(UCLASS_SPI, bus_node, &bus);
-	if (ret)
-		return NULL;
-	ret = device_get_child_by_of_offset(bus, node, &dev);
-	if (ret)
-		return NULL;
-	return dev_get_parent_priv(dev);
-}
-
-/* Compatibility function - to be removed */
 struct spi_slave *spi_setup_slave(unsigned int busnum, unsigned int cs,
 				  unsigned int speed, unsigned int mode)
 {
diff --git a/include/spi.h b/include/spi.h
index 9c69cd7e87..ebaf2e5f3a 100644
--- a/include/spi.h
+++ b/include/spi.h
@@ -315,19 +315,6 @@ static inline int spi_w8r8(struct spi_slave *slave, unsigned char byte)
 	return ret < 0 ? ret : din[1];
 }

-/**
- * Set up a SPI slave for a particular device tree node
- *
- * This calls spi_setup_slave() with the correct bus number. Call
- * spi_free_slave() to free it later.
- *
- * @param blob:		Device tree blob
- * @param slave_node:	Slave node to use
- * @param spi_node:	SPI peripheral node to use
- * @return pointer to new spi_slave structure
- */
-struct spi_slave *spi_setup_slave_fdt(const void *blob, int slave_node,
-				      int spi_node);
 #ifdef CONFIG_DM_SPI

 /**
--
2.13.6



More information about the U-Boot mailing list