Skip to content

Commit

Permalink
MIPS: Alchemy: Remove prom_getcmdline()
Browse files Browse the repository at this point in the history
Signed-off-by: Yoichi Yuasa <yuasa@linux-mips.org>
Cc: linux-mips <linux-mips@linux-mips.org>
Patchwork: http://patchwork.linux-mips.org/patch/927/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Yoichi Yuasa authored and Ralf Baechle committed Feb 27, 2010
1 parent c63d0cb commit ae7cbef
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
9 changes: 1 addition & 8 deletions arch/mips/alchemy/common/prom.c
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,6 @@ int prom_argc;
char **prom_argv;
char **prom_envp;

char * __init_or_module prom_getcmdline(void)
{
return &(arcs_cmdline[0]);
}

void prom_init_cmdline(void)
{
char *cp;
Expand Down Expand Up @@ -121,14 +116,12 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str)
int prom_get_ethernet_addr(char *ethernet_addr)
{
char *ethaddr_str;
char *argptr;

/* Check the environment variables first */
ethaddr_str = prom_getenv("ethaddr");
if (!ethaddr_str) {
/* Check command line */
argptr = prom_getcmdline();
ethaddr_str = strstr(argptr, "ethaddr=");
ethaddr_str = strstr(arcs_cmdline, "ethaddr=");
if (!ethaddr_str)
return -1;

Expand Down
1 change: 0 additions & 1 deletion arch/mips/include/asm/mach-au1x00/prom.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ extern char **prom_argv;
extern char **prom_envp;

extern void prom_init_cmdline(void);
extern char *prom_getcmdline(void);
extern char *prom_getenv(char *envname);
extern int prom_get_ethernet_addr(char *ethernet_addr);

Expand Down

0 comments on commit ae7cbef

Please sign in to comment.