From 021a32b97dfbda6d57efa9089d1918fc3b7b15ce Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 11 Jul 2019 11:19:03 -0600
Subject: [PATCH] Fix some issues revealed by name changin of commit
 e5dfd805e6cc37103b07a0b7bfcfce02cb1f4ef2.

---
 arch/arm/src/lpc17xx_40xx/Kconfig  | 2 +-
 arch/arm/src/nuc1xx/nuc_serial.c   | 6 +++---
 arch/hc/src/m9s12/m9s12_ethernet.c | 6 +++---
 configs/Kconfig                    | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/arch/arm/src/lpc17xx_40xx/Kconfig b/arch/arm/src/lpc17xx_40xx/Kconfig
index 004fcf9369..6c1eda91ff 100644
--- a/arch/arm/src/lpc17xx_40xx/Kconfig
+++ b/arch/arm/src/lpc17xx_40xx/Kconfig
@@ -115,7 +115,7 @@ config ARCH_CHIP_LPC1788
 	bool "LPC1788"
 	select ARCH_FAMILY_LPC178X
 	select ARCH_CORTEXM3
-	
+
 config ARCH_CHIP_LPC4072
 	bool "LPC4072"
 	select ARCH_FAMILY_LPC407X
diff --git a/arch/arm/src/nuc1xx/nuc_serial.c b/arch/arm/src/nuc1xx/nuc_serial.c
index b536e9034f..76cfd3d8ba 100644
--- a/arch/arm/src/nuc1xx/nuc_serial.c
+++ b/arch/arm/src/nuc1xx/nuc_serial.c
@@ -151,7 +151,7 @@ static char g_uart2rxbuffer[CONFIG_UART2_RXBUFSIZE];
 static char g_uart2txbuffer[CONFIG_UART2_TXBUFSIZE];
 #endif
 
-/* This describes the state of the LPC17xx/LPC40xx uart0 port. */
+/* This describes the state of the NUC1xx uart0 port. */
 
 #ifdef CONFIG_NUC_UART0
 static struct nuc_dev_s g_uart0priv =
@@ -182,7 +182,7 @@ static uart_dev_t g_uart0port =
 };
 #endif /* CONFIG_NUC_UART0 */
 
-/* This describes the state of the LPC17xx/LPC40xx uart1 port. */
+/* This describes the state of the NUC1xx uart1 port. */
 
 #ifdef CONFIG_NUC_UART1
 static struct nuc_dev_s g_uart1priv =
@@ -213,7 +213,7 @@ static uart_dev_t g_uart1port =
 };
 #endif /* CONFIG_NUC_UART1 */
 
-/* This describes the state of the LPC17xx/LPC40xx uart1 port. */
+/* This describes the state of the NUC1xx uart1 port. */
 
 #ifdef CONFIG_NUC_UART2
 static struct nuc_dev_s g_uart2priv =
diff --git a/arch/hc/src/m9s12/m9s12_ethernet.c b/arch/hc/src/m9s12/m9s12_ethernet.c
index 317ff4a635..0ccb7cb083 100644
--- a/arch/hc/src/m9s12/m9s12_ethernet.c
+++ b/arch/hc/src/m9s12/m9s12_ethernet.c
@@ -744,12 +744,12 @@ static int emac_rmmac(struct net_driver_s *dev, FAR const uint8_t *mac)
 
 int emac_initialize(int intf)
 {
-  struct lpc17_40_driver_s *priv;
+  struct emac_driver_s *priv;
 
   /* Get the interface structure associated with this interface number. */
 
   DEBUGASSERT(inf <  CONFIG_HCS12_NINTERFACES);
-  priv = &g_ethdrvr[intf];
+  priv = &g_emac[intf];
 
    /* Check if a Ethernet chip is recognized at its I/O base */
 
@@ -773,7 +773,7 @@ int emac_initialize(int intf)
   priv->d_dev.d_addmac  = emac_addmac;   /* Add multicast MAC address */
   priv->d_dev.d_rmmac   = emac_rmmac;    /* Remove multicast MAC address */
 #endif
-  priv->d_dev.d_private = (void*)g_emac; /* Used to recover private state from dev */
+  priv->d_dev.d_private = priv;          /* Used to recover private state from dev */
 
   /* Create a watchdog for timing polling for and timing of transmissions */
 
diff --git a/configs/Kconfig b/configs/Kconfig
index 7f3a4b156a..f9f946e39f 100644
--- a/configs/Kconfig
+++ b/configs/Kconfig
@@ -450,7 +450,7 @@ config ARCH_BOARD_LPC4088_DEVKIT
 	select ARCH_HAVE_BUTTONS
 	select ARCH_HAVE_IRQBUTTONS
 	---help---
-		Embedded Artists LPC4088 Developer's Kit. See 	
+		Embedded Artists LPC4088 Developer's Kit. See
 		https://www.embeddedartists.com/products/lpc4088-developers-kit/
 		for further information. This board uses the NXP LPC4088FET208 MCU.
 
@@ -461,7 +461,7 @@ config ARCH_BOARD_LPC4088_QUICKSTART
 	select ARCH_HAVE_BUTTONS
 	select ARCH_HAVE_IRQBUTTONS
 	---help---
-		Embedded Artists LPC4088 QuickStart Board. See 	
+		Embedded Artists LPC4088 QuickStart Board. See
 		https://www.embeddedartists.com/products/lpc4088-quickstart-board/
 		for further information. This board uses the NXP LPC4088FET208 MCU.