UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

davinci: DA850 EVM: kill useless variable 

Commit 75e2ea643f (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>
This commit is contained in:
Sergei Shtylyov 2011-02-25 12:26:36 +05:30 committed by Kevin Hilman
parent 16a3c8320a
commit b688c2fba5
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-davinci/board-da850-evm.c
View File

@ -298,8 +298,6 @@ static const short da850_evm_nor_pins[] = {
-1 -1
}; };
static u32 ui_card_detected;
#if defined(CONFIG_MMC_DAVINCI) || \ #if defined(CONFIG_MMC_DAVINCI) || \
defined(CONFIG_MMC_DAVINCI_MODULE) defined(CONFIG_MMC_DAVINCI_MODULE)
#define HAS_MMC 1 #define HAS_MMC 1
@ -311,7 +309,7 @@ static inline void da850_evm_setup_nor_nand(void)
{ {
int ret = 0; int ret = 0;
if (ui_card_detected & !HAS_MMC) { if (!HAS_MMC) {
ret = davinci_cfg_reg_list(da850_evm_nand_pins); ret = davinci_cfg_reg_list(da850_evm_nand_pins);
if (ret) if (ret)
pr_warning("da850_evm_init: nand mux setup failed: " 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; goto exp_setup_keys_fail;
} }
ui_card_detected = 1;
pr_info("DA850/OMAP-L138 EVM UI card detected\n"); pr_info("DA850/OMAP-L138 EVM UI card detected\n");
da850_evm_setup_nor_nand(); da850_evm_setup_nor_nand();