Make naming consistent for USB host initialiation functions

8 files changed, 10 insertions, 16 deletions

diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c
index fc4f4e92c..5980a8d2a 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.c
@@ -2502,7 +2502,7 @@ static inline void lpc17_ep0init(struct lpc17_usbhost_s *priv)
  *******************************************************************************/
 
 /*******************************************************************************
- * Name: usbhost_initialize
+ * Name: lpc17_usbhost_initialize
  *
  * Description:
  *   Initialize USB host device controller hardware.
@@ -2526,7 +2526,7 @@ static inline void lpc17_ep0init(struct lpc17_usbhost_s *priv)
  *
  *******************************************************************************/
 
-FAR struct usbhost_connection_s *usbhost_initialize(int controller)
+FAR struct usbhost_connection_s *lpc17_usbhost_initialize(int controller)
 {
   struct lpc17_usbhost_s *priv = &g_usbhost;
   uint32_t regval;
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.h b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.h
index f27280372..43f7b66f3 100644
--- a/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.h
+++ b/nuttx/arch/arm/src/lpc17xx/lpc17_usbhost.h
@@ -70,7 +70,7 @@ extern "C"
 #endif
 
 /*******************************************************************************
- * Name: usbhost_initialize
+ * Name: lpc17_usbhost_initialize
  *
  * Description:
  *   Initialize USB host device controller hardware.
@@ -96,7 +96,7 @@ extern "C"
 
 #ifdef CONFIG_USBHOST
 struct usbhost_connection_s;
-FAR struct usbhost_connection_s *usbhost_initialize(int controller);
+FAR struct usbhost_connection_s *lpc17_usbhost_initialize(int controller);
 #endif
 
 #undef EXTERN
diff --git a/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c b/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c
index d74ec7c8a..7a124c29a 100644
--- a/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c
+++ b/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c
@@ -279,7 +279,7 @@ static int nsh_usbhostinitialize(void)
   /* Then get an instance of the USB host interface */
 
   message("nsh_usbhostinitialize: Initialize USB host\n");
-  g_usbconn = usbhost_initialize(0);
+  g_usbconn = lpc17_usbhost_initialize(0);
   if (g_usbconn)
     {
       /* Start a thread to handle device connection. */
diff --git a/nuttx/configs/open1788/src/lpc17_nsh.c b/nuttx/configs/open1788/src/lpc17_nsh.c
index a1899501e..18ec04667 100644
--- a/nuttx/configs/open1788/src/lpc17_nsh.c
+++ b/nuttx/configs/open1788/src/lpc17_nsh.c
@@ -336,7 +336,7 @@ static int nsh_usbhostinitialize(void)
   /* Then get an instance of the USB host interface */
 
   message("nsh_usbhostinitialize: Initialize USB host\n");
-  g_usbconn = usbhost_initialize(0);
+  g_usbconn = lpc17_usbhost_initialize(0);
   if (g_usbconn)
     {
       /* Start a thread to handle device connection. */
diff --git a/nuttx/configs/pic32-starterkit/src/up_nsh.c b/nuttx/configs/pic32-starterkit/src/up_nsh.c
index f0731b8f4..4eda69bda 100644
--- a/nuttx/configs/pic32-starterkit/src/up_nsh.c
+++ b/nuttx/configs/pic32-starterkit/src/up_nsh.c
@@ -300,7 +300,7 @@ static int nsh_usbhostinitialize(void)
   /* Then get an instance of the USB host interface */
 
   message("nsh_usbhostinitialize: Initialize USB host\n");
-  g_usbconn = usbhost_initialize(0);
+  g_usbconn = pic32_usbhost_initialize(0);
   if (g_usbconn)
     {
       /* Start a thread to handle device connection. */
diff --git a/nuttx/configs/pic32mx7mmb/src/up_nsh.c b/nuttx/configs/pic32mx7mmb/src/up_nsh.c
index 5647702fc..e70ba5667 100644
--- a/nuttx/configs/pic32mx7mmb/src/up_nsh.c
+++ b/nuttx/configs/pic32mx7mmb/src/up_nsh.c
@@ -308,7 +308,7 @@ static int nsh_usbhostinitialize(void)
   /* Then get an instance of the USB host interface */
 
   message("nsh_usbhostinitialize: Initialize USB host\n");
-  g_usbconn = usbhost_initialize(0);
+  g_usbconn = pic32_usbhost_initialize(0);
   if (g_usbconn)
     {
       /* Start a thread to handle device connection. */
diff --git a/nuttx/configs/sama5d3x-ek/src/sam_usb.c b/nuttx/configs/sama5d3x-ek/src/sam_usb.c
index 3d7d2f48e..556ee2cf1 100644
--- a/nuttx/configs/sama5d3x-ek/src/sam_usb.c
+++ b/nuttx/configs/sama5d3x-ek/src/sam_usb.c
@@ -328,13 +328,7 @@ int sam_usbhost_initialize(void)
       udbg("ERROR: Failed to register the KBD class\n");
     }
 
-  /* Then get an instance of the USB host interface.
-   *
-   * REVISIT:  This logic needs to be modified.  There must be a call-out to
-   * platform specific logic to get the connection hangle.  usbhost_initialize()
-   * is not longer common to all platforms and is no longer prototyped in
-   * include/nuttx/usb/usbhost.h.
-   */
+  /* Then get an instance of the USB host interface. */
 
 #ifdef CONFIG_SAMA5_OHCI
   /* Get an instance of the USB OHCI interface */
diff --git a/nuttx/configs/sure-pic32mx/src/pic32mx_nsh.c b/nuttx/configs/sure-pic32mx/src/pic32mx_nsh.c
index f36830fcb..43994595c 100644
--- a/nuttx/configs/sure-pic32mx/src/pic32mx_nsh.c
+++ b/nuttx/configs/sure-pic32mx/src/pic32mx_nsh.c
@@ -300,7 +300,7 @@ static int nsh_usbhostinitialize(void)
   /* Then get an instance of the USB host interface */
 
   message("nsh_usbhostinitialize: Initialize USB host\n");
-  g_usbconn = usbhost_initialize(0);
+  g_usbconn = pic32_usbhost_initialize(0);
   if (g_usbconn)
     {
       /* Start a thread to handle device connection. */