From: Eric Miao <eric.miao@marvell.com>
Date: Thu, 12 Jun 2008 10:49:08 +0000 (+0800)
Subject: [ARM] pxa: embed body of pxa320_init_mfp()
X-Git-Tag: v2.6.27-rc1~850^2^2~13^2~14
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d4a678080e83ff96e3933fa1e631cef3cda04bef;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/arch/arm/mach-pxa/pxa320.c b/arch/arm/mach-pxa/pxa320.c
index 74128eb8f8d..44ef0b95db0 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;
 }