Skip to content

Commit

Permalink
[ARM] pxa: embed body of pxa320_init_mfp()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Eric Miao authored and Russell King committed Jul 9, 2008
1 parent 6d3dfe4 commit d4a6780
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions arch/arm/mach-pxa/pxa320.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit d4a6780

Please sign in to comment.