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

Commit 0744a3ee authored by Russell King's avatar Russell King
Browse files

ARM: platform fixups: remove mdesc argument to fixup function 



Get rid of the mdesc pointer in the fixup function call.  No one uses
the mdesc pointer, it shouldn't be modified anyway, and we can't wrap
it, so let's remove it.

Platform files found by:

  $ regexp=$(git grep -h '\.fixup.*=' arch/arm |
		sed 's!.*= *\([^,]*\),* *!\1!' | sort -u |
		tr '\n' '|' | sed 's,|$,,;s,|,\\|,g')
  $ git grep $regexp arch/arm

Acked-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 87e040b6

arch/arm/include/asm/mach/arch.h

+1 −2
Original line number Diff line number Diff line
@@ -34,8 +34,7 @@ struct machine_desc { 
	unsigned int		reserve_lp1 :1;	/* never has lp1	*/

	unsigned int		reserve_lp2 :1;	/* never has lp2	*/

	unsigned int		soft_reboot :1;	/* soft reboot		*/

	void			(*fixup)(struct machine_desc *,

					 struct tag *, char **,

	void			(*fixup)(struct tag *, char **,

					 struct meminfo *);

	void			(*reserve)(void);/* reserve mem blocks	*/

	void			(*map_io)(void);/* IO mapping function	*/

arch/arm/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -879,7 +879,7 @@ static struct machine_desc * __init setup_machine_tags(unsigned int nr) 
	}



	if (mdesc->fixup)

		mdesc->fixup(mdesc, tags, &from, &meminfo);

		mdesc->fixup(tags, &from, &meminfo);



	if (tags->hdr.tag == ATAG_CORE) {

		if (meminfo.nr_banks != 0)

arch/arm/mach-bcmring/arch.c

+2 −2
Original line number Diff line number Diff line
@@ -136,8 +136,8 @@ static void __init bcmring_init_machine(void) 
*

*****************************************************************************/



static void __init bcmring_fixup(struct machine_desc *desc,

     struct tag *t, char **cmdline, struct meminfo *mi) {

static void __init bcmring_fixup(struct tag *t, char **cmdline,

	struct meminfo *mi) {

#ifdef CONFIG_BLK_DEV_INITRD

	printk(KERN_NOTICE "bcmring_fixup\n");

	t->hdr.tag = ATAG_CORE;

arch/arm/mach-clps711x/clep7312.c

+1 −2
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ 
#include "common.h"



static void __init

fixup_clep7312(struct machine_desc *desc, struct tag *tags,

	    char **cmdline, struct meminfo *mi)

fixup_clep7312(struct tag *tags, char **cmdline, struct meminfo *mi)

{

	mi->nr_banks=1;

	mi->bank[0].start = 0xc0000000;

arch/arm/mach-clps711x/edb7211-arch.c

+1 −2
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ static void __init edb7211_reserve(void) 
}



static void __init

fixup_edb7211(struct machine_desc *desc, struct tag *tags,

	      char **cmdline, struct meminfo *mi)

fixup_edb7211(struct tag *tags, char **cmdline, struct meminfo *mi)

{

	/*

	 * Bank start addresses are not present in the information