update AU1000 get_ethernet_addr()

Update AU1000 get_ethernet_addr().
Three functions were brought together in one.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Acked-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 16 insertions, 22 deletions

diff --git a/arch/mips/au1000/common/prom.c b/arch/mips/au1000/common/prom.c
index a8637cdb5b4b..5d6ddf1ed7a6 100644
--- a/arch/mips/au1000/common/prom.c
+++ b/arch/mips/au1000/common/prom.c
@@ -98,7 +98,7 @@ char *prom_getenv(char *envname)
         return NULL;
 }
 
-inline unsigned char str2hexnum(unsigned char c)
+static inline unsigned char str2hexnum(unsigned char c)
 {
         if(c >= '0' && c <= '9')
                 return c - '0';
@@ -109,7 +109,7 @@ inline unsigned char str2hexnum(unsigned char c)
         return 0; /* foo */
 }
 
-inline void str2eaddr(unsigned char *ea, unsigned char *str)
+static inline void str2eaddr(unsigned char *ea, unsigned char *str)
 {
         int i;
 
@@ -124,35 +124,29 @@ inline void str2eaddr(unsigned char *ea, unsigned char *str)
         }
 }
 
-int get_ethernet_addr(char *ethernet_addr)
+int prom_get_ethernet_addr(char *ethernet_addr)
 {
-        char *ethaddr_str;
+        char *ethaddr_str;
+        char *argptr;
 
-        ethaddr_str = prom_getenv("ethaddr");
+        /* Check the environment variables first */
+        ethaddr_str = prom_getenv("ethaddr");
         if (!ethaddr_str) {
-                printk("ethaddr not set in boot prom\n");
-                return -1;
-        }
-        str2eaddr(ethernet_addr, ethaddr_str);
-
-#if 0
-        {
-                int i;
+                /* Check command line */
+                argptr = prom_getcmdline();
+                ethaddr_str = strstr(argptr, "ethaddr=");
+                if (!ethaddr_str)
+                        return -1;
 
-        printk("get_ethernet_addr: ");
-        for (i=0; i<5; i++)
-                printk("%02x:", (unsigned char)*(ethernet_addr+i));
-        printk("%02x\n", *(ethernet_addr+i));
+                ethaddr_str += strlen("ethaddr=");
         }
-#endif
+
+        str2eaddr(ethernet_addr, ethaddr_str);
 
         return 0;
 }
+EXPORT_SYMBOL(prom_get_ethernet_addr);
 
 void __init prom_free_prom_memory(void)
 {
 }
-
-EXPORT_SYMBOL(prom_getcmdline);
-EXPORT_SYMBOL(get_ethernet_addr);
-EXPORT_SYMBOL(str2eaddr);