Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae7cbef5 authored by Yoichi Yuasa's avatar Yoichi Yuasa Committed by Ralf Baechle
Browse files

MIPS: Alchemy: Remove prom_getcmdline() 



Signed-off-by: default avatarYoichi Yuasa <yuasa@linux-mips.org>
Cc: linux-mips <linux-mips@linux-mips.org>
Patchwork: http://patchwork.linux-mips.org/patch/927/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent c63d0cb5

arch/mips/alchemy/common/prom.c

+1 −8
Original line number Original line Diff line number Diff line
@@ -43,11 +43,6 @@ int prom_argc; 
char **prom_argv;

char **prom_argv;

char **prom_envp;

char **prom_envp;





char * __init_or_module prom_getcmdline(void)

{

	return &(arcs_cmdline[0]);

}



void prom_init_cmdline(void)

void prom_init_cmdline(void)

{

{

	char *cp;

	char *cp;
@@ -121,14 +116,12 @@ static inline void str2eaddr(unsigned char *ea, unsigned char *str) 
int prom_get_ethernet_addr(char *ethernet_addr)

int prom_get_ethernet_addr(char *ethernet_addr)

{

{

	char *ethaddr_str;

	char *ethaddr_str;

	char *argptr;





	/* Check the environment variables first */

	/* Check the environment variables first */

	ethaddr_str = prom_getenv("ethaddr");

	ethaddr_str = prom_getenv("ethaddr");

	if (!ethaddr_str) {

	if (!ethaddr_str) {

		/* Check command line */

		/* Check command line */

		argptr = prom_getcmdline();

		ethaddr_str = strstr(arcs_cmdline, "ethaddr=");

		ethaddr_str = strstr(argptr, "ethaddr=");

		if (!ethaddr_str)

		if (!ethaddr_str)

			return -1;

			return -1;

arch/mips/include/asm/mach-au1x00/prom.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,6 @@ extern char **prom_argv; 
extern char **prom_envp;

extern char **prom_envp;





extern void prom_init_cmdline(void);

extern void prom_init_cmdline(void);

extern char *prom_getcmdline(void);

extern char *prom_getenv(char *envname);

extern char *prom_getenv(char *envname);

extern int prom_get_ethernet_addr(char *ethernet_addr);

extern int prom_get_ethernet_addr(char *ethernet_addr);