Commit e8940759 authored by Nishad Kamdar's avatar Nishad Kamdar Committed by Greg Kroah-Hartman

staging: mt7621-mmc: Fix incompletely removed #if 0 block in sd.c

Commit 2a54e325 ("staging: mt7621-mmc: Remove #if 0 blocks in sd.c")
does not completely remove an #if 0 block in sd.c. This causes the function
msdc_select_clksrc() which was eariler not compiled, to be compiled.
That causes an error - MSDC_CLKSRC_REG is not defined.

This patch completely removes the #if 0 block
Reported-by: default avatarNeilBrown <neil@brown.name>
Fixes: 2a54e325 ("staging: mt7621-mmc: Remove #if 0 blocks in sd.c")
Signed-off-by: default avatarNishad Kamdar <nishadkamdar@gmail.com>
Reviewed-by: default avatarNeilBrown <neil@brown.name>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4cc357c5
...@@ -217,26 +217,6 @@ static void msdc_tasklet_card(struct work_struct *work) ...@@ -217,26 +217,6 @@ static void msdc_tasklet_card(struct work_struct *work)
spin_unlock(&host->lock); spin_unlock(&host->lock);
} }
static void msdc_select_clksrc(struct msdc_host *host, unsigned char clksrc)
{
u32 val;
BUG_ON(clksrc > 3);
val = readl(host->base + MSDC_CLKSRC_REG);
if (readl(host->base + MSDC_ECO_VER) >= 4) {
val &= ~(0x3 << clk_src_bit[host->id]);
val |= clksrc << clk_src_bit[host->id];
} else {
val &= ~0x3; val |= clksrc;
}
writel(val, host->base + MSDC_CLKSRC_REG);
host->hclk = hclks[clksrc];
host->hw->clk_src = clksrc;
}
#endif /* end of --- */
static void msdc_set_mclk(struct msdc_host *host, int ddr, unsigned int hz) static void msdc_set_mclk(struct msdc_host *host, int ddr, unsigned int hz)
{ {
//struct msdc_hw *hw = host->hw; //struct msdc_hw *hw = host->hw;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment