From d06fae98a352bb7c58b3b7a8be64b7a61a580166 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Tue, 26 Jan 2016 15:58:33 -0600
Subject: [PATCH] EFM32: Rename efm_spi_initialize to efm_spibus_initialize for
 compatibility with corresponding changes to other platforms

---
 arch/arm/src/efm32/efm32_spi.c |  6 +++---
 arch/arm/src/efm32/efm32_spi.h | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/arch/arm/src/efm32/efm32_spi.c b/arch/arm/src/efm32/efm32_spi.c
index f0dd854b4c..19668e56d4 100644
--- a/arch/arm/src/efm32/efm32_spi.c
+++ b/arch/arm/src/efm32/efm32_spi.c
@@ -1553,7 +1553,7 @@ static int spi_portinitialize(struct efm32_spidev_s *priv)
    *
    * 1. USART GPIO pins were configured in efm32_lowsetup().  Chip select
    *    pins must be configured by board specific logic before
-   *    efm32_spi_initialize() is called.
+   *    efm32_spibus_initialize() is called.
    * 2. Clocking for the USART as also enabled in efm32_lowsetup();
    */
 
@@ -1645,7 +1645,7 @@ errout:
  ****************************************************************************/
 
 /****************************************************************************
- * Name: efm32_spi_initialize
+ * Name: efm32_spibus_initialize
  *
  * Description:
  *   Initialize the selected SPI port
@@ -1658,7 +1658,7 @@ errout:
  *
  ****************************************************************************/
 
-struct spi_dev_s *efm32_spi_initialize(int port)
+struct spi_dev_s *efm32_spibus_initialize(int port)
 {
   const struct efm32_spiconfig_s *config;
   struct efm32_spidev_s *priv;
diff --git a/arch/arm/src/efm32/efm32_spi.h b/arch/arm/src/efm32/efm32_spi.h
index 8797fdef23..2e5fbdcc66 100644
--- a/arch/arm/src/efm32/efm32_spi.h
+++ b/arch/arm/src/efm32/efm32_spi.h
@@ -52,7 +52,7 @@
  ****************************************************************************/
 
 /****************************************************************************
- * Name: efm32_spi_initialize
+ * Name: efm32_spibus_initialize
  *
  * Description:
  *   Initialize the selected SPI port
@@ -66,7 +66,7 @@
  ****************************************************************************/
 
 struct spi_dev_s;
-struct spi_dev_s *efm32_spi_initialize(int port);
+struct spi_dev_s *efm32_spibus_initialize(int port);
 
 /****************************************************************************
  * Name:  efm32_spi[n]_select,  efm32_spi[n]_status, and efm32_spi[n]_cmddata
@@ -76,7 +76,7 @@ struct spi_dev_s *efm32_spi_initialize(int port);
  *   efm32_spi[n]_cmddata must be provided by board-specific logic.  These
  *   are implementations of the select, status, and cmddata methods of the
  *   SPI interface defined by struct spi_ops_s (see include/nuttx/spi/spi.h).
- *   All other methods (including up_spiinitialize()) are provided by common
+ *   All other methods (including efm32_spibus_initialize()) are provided by common
  *   EFM32 logic.  To use this common SPI logic on your board:
  *
  *   1. Provide logic in efm32_boardinitialize() to configure SPI chip select
@@ -89,9 +89,9 @@ struct spi_dev_s *efm32_spi_initialize(int port);
  *      then provide efm32_spi[n]_cmddata() functions in your board-specific
  *      logic.  These functions will perform cmd/data selection operations
  *      using GPIOs in the way your board is configured.
- *   4. Add a calls to up_spiinitialize() in your low level application
+ *   4. Add a calls to efm32_spibus_initialize() in your low level application
  *      initialization logic
- *   5. The handle returned by up_spiinitialize() may then be used to bind
+ *   5. The handle returned by efm32_spibus_initialize() may then be used to bind
  *      the  SPI driver to higher level logic (e.g., calling
  *      mmcsd_spislotinitialize(), for example, will bind the SPI driver to
  *      the SPI MMC/SD driver).