Skip to content

Commit

Permalink
davinci: DA850 EVM: kill useless variable
Browse files Browse the repository at this point in the history
Commit 75e2ea6 (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>
  • Loading branch information
Sergei Shtylyov authored and Kevin Hilman committed Mar 11, 2011
1 parent 16a3c83 commit b688c2f
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions arch/arm/mach-davinci/board-da850-evm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: "
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit b688c2f

Please sign in to comment.