[ARM] pxa: embed body of pxa320_init_mfp()
authorEric Miao <eric.miao@marvell.com>
Thu, 12 Jun 2008 10:49:08 +0000 (18:49 +0800)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 9 Jul 2008 20:38:32 +0000 (21:38 +0100)
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>
arch/arm/mach-pxa/pxa320.c

index 74128eb8f8d0dd5983585c89203e45410e53cfbc..44ef0b95db00bc9b28d9e54db10b5e16480d0a6f 100644 (file)
@@ -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;
 }