diff options
| author | Sergei Shtylyov <[sshtylyov@ru.mvista.com]> | 2011-02-25 12:26:36 +0530 |
|---|---|---|
| committer | Kevin Hilman <khilman@ti.com> | 2011-03-11 10:48:29 -0800 |
| commit | b688c2fba51615b9746b1357925e18c85c57abd5 (patch) | |
| tree | 6cce1fbe8980d2028078fe99050bbdec1a47defc /arch/arm | |
| parent | 16a3c8320a19467e26f7194dc2e21c63635ee157 (diff) | |
| download | kernel_samsung_smdk4412-b688c2fba51615b9746b1357925e18c85c57abd5.zip kernel_samsung_smdk4412-b688c2fba51615b9746b1357925e18c85c57abd5.tar.gz kernel_samsung_smdk4412-b688c2fba51615b9746b1357925e18c85c57abd5.tar.bz2 | |
davinci: DA850 EVM: kill useless variable
Commit 75e2ea643fe43d5aa836475acee5bd97cd9ea4bf (davinci: DA850/OMAP-L138 EVM
expander setup and UI card detection) introduced a useless variable: it's
always set to 1 before it's checked in da850_evm_setup_nor_nand()...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Acked-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-davinci/board-da850-evm.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c index 0aef6b2..a7b41bf 100644 --- a/arch/arm/mach-davinci/board-da850-evm.c +++ b/arch/arm/mach-davinci/board-da850-evm.c @@ -298,8 +298,6 @@ static const short da850_evm_nor_pins[] = { -1 }; -static u32 ui_card_detected; - #if defined(CONFIG_MMC_DAVINCI) || \ defined(CONFIG_MMC_DAVINCI_MODULE) #define HAS_MMC 1 @@ -311,7 +309,7 @@ static inline void da850_evm_setup_nor_nand(void) { int ret = 0; - if (ui_card_detected & !HAS_MMC) { + if (!HAS_MMC) { ret = davinci_cfg_reg_list(da850_evm_nand_pins); if (ret) pr_warning("da850_evm_init: nand mux setup failed: " @@ -461,7 +459,6 @@ static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio, goto exp_setup_keys_fail; } - ui_card_detected = 1; pr_info("DA850/OMAP-L138 EVM UI card detected\n"); da850_evm_setup_nor_nand(); |