staging: mt7621-mmc: Fix incompletely removed #if 0 block in sd.c
Commit2a54e3259e
("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: NeilBrown <neil@brown.name> Fixes:2a54e3259e
("staging: mt7621-mmc: Remove #if 0 blocks in sd.c") Signed-off-by: Nishad Kamdar <nishadkamdar@gmail.com> Reviewed-by: NeilBrown <neil@brown.name> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
4cc357c500
commit
e894075934
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue