diff options
| author | Rabin Vincent <rabin.vincent@stericsson.com> | 2011-11-17 14:30:23 +0530 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:02:33 +0200 |
| commit | 496267d3fe4a69547ea9144a0cb00dd4fe25130d (patch) | |
| tree | c5248cf6be2ea2cafead0b6d0f69b84cdc7f8df7 | |
| parent | b93a6cb914408204fc80875ee085ed7134f81de9 (diff) | |
u5500: cleanup is_s5500_board()
Rename is_s5500_board() -> u5500_board_is_s5500()
Fix some warnings.
Do it only once.
ST-Ericsson ID: 370147
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: Iaeb5b0dc73e8c81d5e7ca444378e010dfa4b30c3
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/38116
Reviewed-by: Nikhil BHANDARY <nikhil.bhandary@stericsson.com>
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500.c | 14 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-u5500.h | 2 |
2 files changed, 12 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c index c96c4532e83..f9bac3cbb69 100644 --- a/arch/arm/mach-ux500/board-u5500.c +++ b/arch/arm/mach-ux500/board-u5500.c @@ -572,9 +572,14 @@ static struct platform_device *u5500_platform_devices[] __initdata = { * This function check whether it is Small S5500 board * GPIO0 is HIGH for S5500 */ -bool is_s5500_board() +bool u5500_board_is_s5500(void) { - int err , val ; + static bool s5500; + static bool once; + int err, val; + + if (once) + return s5500; err = gpio_request(GPIO_BOARD_VERSION, "Board Version"); if (err) { @@ -594,7 +599,10 @@ bool is_s5500_board() gpio_free(GPIO_BOARD_VERSION); - return (val == 1); + s5500 = val; + once = true; + + return val; } static long u5500_panic_blink(int state) diff --git a/arch/arm/mach-ux500/board-u5500.h b/arch/arm/mach-ux500/board-u5500.h index 26aa49e3889..6813fd6500a 100644 --- a/arch/arm/mach-ux500/board-u5500.h +++ b/arch/arm/mach-ux500/board-u5500.h @@ -28,6 +28,6 @@ extern struct ab5500_regulator_platform_data u5500_ab5500_regulator_data; extern void u5500_pins_init(void); extern void __init u5500_regulators_init(void); void u5500_cyttsp_init(void); -bool is_s5500_board(); +bool u5500_board_is_s5500(void); #endif |