[PATCH 0/3] A few cleanups for MIPS code

[PATCH 0/3] A few cleanups for MIPS code

[Dmitri Vorobiev]

Hi Ralf,

Just a few cleanups in the vicinity of command line processing.

Thanks,
Dmitri

[PATCH 1/3] [MIPS] mipssim: remove unused code

[Dmitri Vorobiev]

The function prom_init_cmdline() doesn't do anything, and nobody calls
the prom_getcmdline() function. Since these two are the only functions
in the file arch/mips/mipssim/sim_cmdline.c, the whole file can be
removed now along with the call to the no-op prom_init_cmdline()
routine.

Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@movial.com>
---
 arch/mips/mipssim/sim_cmdline.c |   32 --------------------------------
 arch/mips/mipssim/sim_setup.c   |    1 -
 2 files changed, 0 insertions(+), 33 deletions(-)
 delete mode 100644 arch/mips/mipssim/sim_cmdline.c

diff --git a/arch/mips/mipssim/sim_cmdline.c b/arch/mips/mipssim/sim_cmdline.c
deleted file mode 100644
index 74240e1..0000000
--- a/arch/mips/mipssim/sim_cmdline.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2005 MIPS Technologies, Inc.  All rights reserved.
- *
- *  This program is free software; you can distribute it and/or modify it
- *  under the terms of the GNU General Public License (Version 2) as
- *  published by the Free Software Foundation.
- *
- *  This program is distributed in the hope it will be useful, but WITHOUT
- *  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- *  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- *  for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
- *
- */
-#include <linux/init.h>
-#include <linux/string.h>
-#include <asm/bootinfo.h>
-
-extern char arcs_cmdline[];
-
-char * __init prom_getcmdline(void)
-{
-	return arcs_cmdline;
-}
-
-void  __init prom_init_cmdline(void)
-{
-	/* XXX: Get boot line from environment? */
-}
diff --git a/arch/mips/mipssim/sim_setup.c b/arch/mips/mipssim/sim_setup.c
index 2877675..0824f6a 100644
--- a/arch/mips/mipssim/sim_setup.c
+++ b/arch/mips/mipssim/sim_setup.c
@@ -61,7 +61,6 @@ void __init prom_init(void)
 	set_io_port_base(0xbfd00000);
 
 	pr_info("\nLINUX started...\n");
-	prom_init_cmdline();
 	prom_meminit();
 
 #ifdef CONFIG_MIPS_MT_SMP
-- 
1.6.0.4

Re: [PATCH 1/3] [MIPS] mipssim: remove unused code

[Ralf Baechle]

On Wed, Oct 14, 2009 at 10:02:17PM +0300, Dmitri Vorobiev wrote:

> The function prom_init_cmdline() doesn't do anything, and nobody calls
> the prom_getcmdline() function. Since these two are the only functions
> in the file arch/mips/mipssim/sim_cmdline.c, the whole file can be
> removed now along with the call to the no-op prom_init_cmdline()
> routine.

Queued for 2.6.33.  Thanks!

  Ralf

Re: [PATCH 1/3] [MIPS] mipssim: remove unused code

[Ralf Baechle]

On Wed, Oct 14, 2009 at 10:02:17PM +0300, Dmitri Vorobiev wrote:

> The function prom_init_cmdline() doesn't do anything, and nobody calls
> the prom_getcmdline() function. Since these two are the only functions
> in the file arch/mips/mipssim/sim_cmdline.c, the whole file can be
> removed now along with the call to the no-op prom_init_cmdline()
> routine.
> 
> Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@movial.com>

And obviously not compile tested:

  CC      arch/mips/mipssim/sim_int.o
make[3]: *** No rule to make target `arch/mips/mipssim/sim_cmdline.o', needed by `arch/mips/mipssim/built-in.o'.  Stop.
make[2]: *** [arch/mips/mipssim] Error 2
make[1]: *** [sub-make] Error 2
make: *** [all] Error 2

  Ralf

[PATCH] [MIPS] Fix MIPSsim build after command-line cleanup

[Dmitri Vorobiev]

Commit `MIPSsim: Remove unused code' removed the file
arch/mips/mipssim/sim_cmdline.c but did not clean the
reference to the corresponding object file.  This patch
is to fix the build breakage resulted from the above.

Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@movial.com>
---
 arch/mips/mipssim/Makefile |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/mips/mipssim/Makefile b/arch/mips/mipssim/Makefile
index 57f43c1..41b9657 100644
--- a/arch/mips/mipssim/Makefile
+++ b/arch/mips/mipssim/Makefile
@@ -17,8 +17,7 @@
 # 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
 #
 
-obj-y := sim_platform.o sim_setup.o sim_mem.o sim_time.o sim_int.o \
-	 sim_cmdline.o
+obj-y := sim_platform.o sim_setup.o sim_mem.o sim_time.o sim_int.o
 
 obj-$(CONFIG_EARLY_PRINTK) += sim_console.o
 obj-$(CONFIG_MIPS_MT_SMTC) += sim_smtc.o
-- 
1.6.3.3

Re: [PATCH] [MIPS] Fix MIPSsim build after command-line cleanup

[Ralf Baechle]

On Sat, Dec 05, 2009 at 02:09:20PM +0200, Dmitri Vorobiev wrote:

> Commit `MIPSsim: Remove unused code' removed the file
> arch/mips/mipssim/sim_cmdline.c but did not clean the
> reference to the corresponding object file.  This patch
> is to fix the build breakage resulted from the above.

I've already done this change myself to what was in the 2.6.33 before it
went upstream, so this is no longer necessary.

Thanks anyway!

  Ralf

Re: [PATCH] [MIPS] Fix MIPSsim build after command-line cleanup

[Dmitri Vorobiev]

On Sun, Dec 20, 2009 at 12:07 AM, Ralf Baechle <ralf@linux-mips.org> wrote:
> On Sat, Dec 05, 2009 at 02:09:20PM +0200, Dmitri Vorobiev wrote:
>
>> Commit `MIPSsim: Remove unused code' removed the file
>> arch/mips/mipssim/sim_cmdline.c but did not clean the
>> reference to the corresponding object file.  This patch
>> is to fix the build breakage resulted from the above.
>
> I've already done this change myself to what was in the 2.6.33 before it
> went upstream, so this is no longer necessary.

OK, thanks for catching the error.

Dmitri

>
> Thanks anyway!
>
>  Ralf
>
>

[PATCH 2/3] [MIPS] msp71xx: remove unused function

[Dmitri Vorobiev]

Nobody calls the board-specific prom_getcmdline(), so let's remove it.

Build-tested using msp71xx_defconfig.

Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@movial.com>
---
 .../mips/include/asm/pmc-sierra/msp71xx/msp_prom.h |    1 -
 arch/mips/pmc-sierra/msp71xx/msp_prom.c            |    7 -------
 2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h
index 14ca7dc..54ef1a9 100644
--- a/arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h
+++ b/arch/mips/include/asm/pmc-sierra/msp71xx/msp_prom.h
@@ -118,7 +118,6 @@
 #define ZSP_DUET		'D'	/* one DUET zsp engine */
 #define ZSP_TRIAD		'T'	/* two TRIAD zsp engines */
 
-extern char *prom_getcmdline(void);
 extern char *prom_getenv(char *name);
 extern void prom_init_cmdline(void);
 extern void prom_meminit(void);
diff --git a/arch/mips/pmc-sierra/msp71xx/msp_prom.c b/arch/mips/pmc-sierra/msp71xx/msp_prom.c
index c317a36..614a20f 100644
--- a/arch/mips/pmc-sierra/msp71xx/msp_prom.c
+++ b/arch/mips/pmc-sierra/msp71xx/msp_prom.c
@@ -302,13 +302,6 @@ char *prom_getenv(char *env_name)
 	return NULL;
 }
 
-/* PROM commandline functions */
-char *prom_getcmdline(void)
-{
-	return &(arcs_cmdline[0]);
-}
-EXPORT_SYMBOL(prom_getcmdline);
-
 void  __init prom_init_cmdline(void)
 {
 	char *cp;
-- 
1.6.0.4

Re: [PATCH 2/3] [MIPS] msp71xx: remove unused function

[Shane McDonald]

[-- Attachment #1: Type: text/plain, Size: 583 bytes --]

On Wed, Oct 14, 2009 at 1:02 PM, Dmitri Vorobiev <dmitri.vorobiev@movial.com
> wrote:

> Nobody calls the board-specific prom_getcmdline(), so let's remove it.
>
> Build-tested using msp71xx_defconfig.
>
> Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@movial.com>
>
>
NAK.  It is called by the MSP71xx's Ethernet driver, whose code has not yet
made it into the mainline (last submission
http://www.linux-mips.org/archives/linux-mips/2007-05/msg00210.html).
Believe it or not, getting that driver whipped into shape is something I'm
slowly (very slowly) working on.

Shane McDonald

[-- Attachment #2: Type: text/html, Size: 1059 bytes --]

Re: [PATCH 2/3] [MIPS] msp71xx: remove unused function

[Ralf Baechle]

On Wed, Oct 14, 2009 at 05:16:08PM -0600, Shane McDonald wrote:

> > Nobody calls the board-specific prom_getcmdline(), so let's remove it.
> >
> > Build-tested using msp71xx_defconfig.
> >
> > Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@movial.com>
> >
> >
> NAK.  It is called by the MSP71xx's Ethernet driver, whose code has not yet
> made it into the mainline (last submission
> http://www.linux-mips.org/archives/linux-mips/2007-05/msg00210.html).
> Believe it or not, getting that driver whipped into shape is something I'm
> slowly (very slowly) working on.

At a glance, it's not outrageously bad so I suggest you submit it to be
merged into drivers/staging it least it will no longer suffer the bitrot
that out of tree drivers suffer from.

  Ralf

Re: [PATCH 2/3] [MIPS] msp71xx: remove unused function

[Shane McDonald]

[-- Attachment #1: Type: text/plain, Size: 1011 bytes --]

On Wed, Oct 14, 2009 at 5:25 PM, Ralf Baechle <ralf@linux-mips.org> wrote:

> On Wed, Oct 14, 2009 at 05:16:08PM -0600, Shane McDonald wrote:
>
> > > Nobody calls the board-specific prom_getcmdline(), so let's remove it.
> > >
> > > Build-tested using msp71xx_defconfig.
> > >
> > > Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@movial.com>
> > >
> > >
> > NAK.  It is called by the MSP71xx's Ethernet driver, whose code has not
> yet
> > made it into the mainline (last submission
> > http://www.linux-mips.org/archives/linux-mips/2007-05/msg00210.html).
> > Believe it or not, getting that driver whipped into shape is something
> I'm
> > slowly (very slowly) working on.
>
> At a glance, it's not outrageously bad so I suggest you submit it to be
> merged into drivers/staging it least it will no longer suffer the bitrot
> that out of tree drivers suffer from.
>
>  Ralf
>

Good idea!  I'll need to clean it up enough so that it compiles and runs
with HEAD, then I'll submit it to drivers/staging.

Shane

[-- Attachment #2: Type: text/html, Size: 1628 bytes --]

[PATCH 3/3] [MIPS] remove an unused header file

[Dmitri Vorobiev]

Nobody includes arch/mips/include/asm/mach-au1x00/prom.h, so remove
this header file now.

Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@movial.com>
---
 arch/mips/include/asm/mach-au1x00/prom.h |   13 -------------
 1 files changed, 0 insertions(+), 13 deletions(-)
 delete mode 100644 arch/mips/include/asm/mach-au1x00/prom.h

diff --git a/arch/mips/include/asm/mach-au1x00/prom.h b/arch/mips/include/asm/mach-au1x00/prom.h
deleted file mode 100644
index e387155..0000000
--- a/arch/mips/include/asm/mach-au1x00/prom.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __AU1X00_PROM_H
-#define __AU1X00_PROM_H
-
-extern int prom_argc;
-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);
-
-#endif
-- 
1.6.0.4

Re: [PATCH 3/3] [MIPS] remove an unused header file

[Manuel Lauss]

[-- Attachment #1: Type: text/plain, Size: 670 bytes --]

On Wed, Oct 14, 2009 at 9:02 PM, Dmitri Vorobiev <dmitri.vorobiev@movial.com>
wrote:
> Nobody includes arch/mips/include/asm/mach-au1x00/prom.h, so remove
> this header file now.

My compiler disagrees:


  CC      arch/mips/alchemy/devboards/prom.o
/mnt/data/_home/mano/db1200/kernel/linux-2.6.git/arch/mips/alchemy/devboards/prom.c:34:18:
error: prom.h: No such file or directory
/mnt/data/_home/mano/db1200/kernel/linux-2.6.git/arch/mips/alchemy/devboards/prom.c:
In function 'prom_init':


It's pulled in through "#include <prom.h>" directives in the alchemy code.
The MIPS
Makefile adds mach directories to the gcc include paths so that this works.

        Manuel

[-- Attachment #2: Type: text/html, Size: 815 bytes --]

Re: [PATCH 3/3] [MIPS] remove an unused header file

[Dmitri Vorobiev]

On Wed, Oct 14, 2009 at 10:12 PM, Manuel Lauss
<manuel.lauss@googlemail.com> wrote:
> On Wed, Oct 14, 2009 at 9:02 PM, Dmitri Vorobiev
> <dmitri.vorobiev@movial.com> wrote:
>> Nobody includes arch/mips/include/asm/mach-au1x00/prom.h, so remove
>> this header file now.
>
> My compiler disagrees:

Hi Manuel,

Thanks for testing this and sorry for the untested patch. Ralf, please
drop this one; the other two in the series must be OK since I
build-tested them.

Thanks,
Dmitri

Re: [PATCH 3/3] [MIPS] remove an unused header file

[Ralf Baechle]

On Wed, Oct 14, 2009 at 10:17:16PM +0300, Dmitri Vorobiev wrote:

> On Wed, Oct 14, 2009 at 10:12 PM, Manuel Lauss
> <manuel.lauss@googlemail.com> wrote:
> > On Wed, Oct 14, 2009 at 9:02 PM, Dmitri Vorobiev
> > <dmitri.vorobiev@movial.com> wrote:
> >> Nobody includes arch/mips/include/asm/mach-au1x00/prom.h, so remove
> >> this header file now.
> >
> > My compiler disagrees:
> 
> Hi Manuel,
> 
> Thanks for testing this and sorry for the untested patch. Ralf, please
> drop this one; the other two in the series must be OK since I
> build-tested them.

Ok, dropped.

  Ralf