Commit e8940759 authored Dec 06, 2018 by Nishad Kamdar Committed by Greg Kroah-Hartman Dec 12, 2018

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: NeilBrown <neil@brown.name>
Fixes: 2a54e325 ("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>

parent 4cc357c5

drivers/staging/mt7621-mmc/sd.c

+0 −20

Original line number	Diff line number	Diff line
		@@ -217,26 +217,6 @@ static void msdc_tasklet_card(struct work_struct *work)
		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)
		{
		//struct msdc_hw *hw = host->hw;

Admin message