diff options
| author | Eric Miao <eric.miao@marvell.com> | 2008-06-12 18:49:08 +0800 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-07-09 21:38:32 +0100 |
| commit | d4a678080e83ff96e3933fa1e631cef3cda04bef (patch) | |
| tree | b742d2c3fb7de65821911ff9e0a741102a8c3b8a /arch/arm/mach-pxa | |
| parent | 6d3dfe4a3141476a3cf59ce6d2d1c25f9b5cfae8 (diff) | |
| download | talos-op-linux-d4a678080e83ff96e3933fa1e631cef3cda04bef.tar.gz talos-op-linux-d4a678080e83ff96e3933fa1e631cef3cda04bef.zip | |
[ARM] pxa: embed body of pxa320_init_mfp()
pxa320_init_mfp() is simple enough to be embedded into pxa320_init()
to simplify the code a bit.
Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa')
| -rw-r--r-- | arch/arm/mach-pxa/pxa320.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/arch/arm/mach-pxa/pxa320.c b/arch/arm/mach-pxa/pxa320.c index 74128eb8f8d0..44ef0b95db00 100644 --- a/arch/arm/mach-pxa/pxa320.c +++ b/arch/arm/mach-pxa/pxa320.c @@ -74,16 +74,12 @@ static struct pxa3xx_mfp_addr_map pxa320_mfp_addr_map[] __initdata = { MFP_ADDR_END, }; -static void __init pxa320_init_mfp(void) -{ - pxa3xx_init_mfp(); - pxa3xx_mfp_init_addr(pxa320_mfp_addr_map); -} - static int __init pxa320_init(void) { - if (cpu_is_pxa320()) - pxa320_init_mfp(); + if (cpu_is_pxa320()) { + pxa3xx_init_mfp(); + pxa3xx_mfp_init_addr(pxa320_mfp_addr_map); + } return 0; } |
