diff options
| author | Jeremy Kerr <jeremy.kerr@canonical.com> | 2010-01-11 23:17:34 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-15 21:39:13 +0000 |
| commit | 2b0d8c251b8876d530a6bf671eb5425838fa698a (patch) | |
| tree | f8b85d4ee0f76be6a45738452e91fbbb94602b4c /arch/arm/mach-footbridge/common.c | |
| parent | e119bfff1f102f8d1505910cd6c09df55c776b43 (diff) | |
| download | kernel_samsung_smdk4412-2b0d8c251b8876d530a6bf671eb5425838fa698a.zip kernel_samsung_smdk4412-2b0d8c251b8876d530a6bf671eb5425838fa698a.tar.gz kernel_samsung_smdk4412-2b0d8c251b8876d530a6bf671eb5425838fa698a.tar.bz2 | |
ARM: 5880/1: arm: use generic infrastructure for early params
The ARM setup code includes its own parser for early params, there's
also one in the generic init code.
This patch removes __early_init (and related code) from
arch/arm/kernel/setup.c, and changes users to the generic early_init
macro instead.
The generic macro takes a char * argument, rather than char **, so we
need to update the parser functions a little.
Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-footbridge/common.c')
| -rw-r--r-- | arch/arm/mach-footbridge/common.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-footbridge/common.c b/arch/arm/mach-footbridge/common.c index 41febc7..e3bc3f6 100644 --- a/arch/arm/mach-footbridge/common.c +++ b/arch/arm/mach-footbridge/common.c @@ -32,12 +32,13 @@ unsigned int mem_fclk_21285 = 50000000; EXPORT_SYMBOL(mem_fclk_21285); -static void __init early_fclk(char **arg) +static int __init early_fclk(char *arg) { - mem_fclk_21285 = simple_strtoul(*arg, arg, 0); + mem_fclk_21285 = simple_strtoul(arg, NULL, 0); + return 0; } -__early_param("mem_fclk_21285=", early_fclk); +early_param("mem_fclk_21285", early_fclk); static int __init parse_tag_memclk(const struct tag *tag) { |