OSDN Git Service

staging: mt7621-mmc: Fix incompletely removed #if 0 block in sd.c
authorNishad Kamdar <nishadkamdar@gmail.com>
Thu, 6 Dec 2018 15:57:06 +0000 (21:27 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 12 Dec 2018 10:57:41 +0000 (11:57 +0100)
Commit 2a54e3259e2a ("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: 2a54e3259e2a ("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>
drivers/staging/mt7621-mmc/sd.c

index f0b24b1..631d131 100644 (file)
@@ -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;