From 0a11d8767f98fb082dc3955013a27550814162bb Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Fri, 29 Nov 2013 14:30:43 -0600
Subject: [PATCH] Make naming consistent for USB host initialiation functions

---
 configs/olimex-lpc1766stk/src/up_nsh.c | 2 +-
 configs/open1788/src/lpc17_nsh.c       | 2 +-
 configs/pic32-starterkit/src/up_nsh.c  | 2 +-
 configs/pic32mx7mmb/src/up_nsh.c       | 2 +-
 configs/sama5d3x-ek/src/sam_usb.c      | 8 +-------
 configs/sure-pic32mx/src/pic32mx_nsh.c | 2 +-
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/configs/olimex-lpc1766stk/src/up_nsh.c b/configs/olimex-lpc1766stk/src/up_nsh.c
index d74ec7c8a2..7a124c29a9 100644
--- a/configs/olimex-lpc1766stk/src/up_nsh.c
+++ b/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/configs/open1788/src/lpc17_nsh.c b/configs/open1788/src/lpc17_nsh.c
index a1899501e8..18ec046678 100644
--- a/configs/open1788/src/lpc17_nsh.c
+++ b/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/configs/pic32-starterkit/src/up_nsh.c b/configs/pic32-starterkit/src/up_nsh.c
index f0731b8f4b..4eda69bdae 100644
--- a/configs/pic32-starterkit/src/up_nsh.c
+++ b/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/configs/pic32mx7mmb/src/up_nsh.c b/configs/pic32mx7mmb/src/up_nsh.c
index 5647702fca..e70ba56670 100644
--- a/configs/pic32mx7mmb/src/up_nsh.c
+++ b/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/configs/sama5d3x-ek/src/sam_usb.c b/configs/sama5d3x-ek/src/sam_usb.c
index 3d7d2f48e3..556ee2cf12 100644
--- a/configs/sama5d3x-ek/src/sam_usb.c
+++ b/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/configs/sure-pic32mx/src/pic32mx_nsh.c b/configs/sure-pic32mx/src/pic32mx_nsh.c
index f36830fcbc..43994595c3 100644
--- a/configs/sure-pic32mx/src/pic32mx_nsh.c
+++ b/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. */