staging: mt7621-mmc: Fix incompletely removed #if 0 block in sd.c
Subsystems (2)
PATCH v2 1/1 staging: mt7621-mmc: Fix incompletely removed #if 0 block in sd.c
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
---
Changes in v2:
- Modify commit message
- Include Fixes: and Reported-by: tags
--- drivers/staging/mt7621-mmc/sd.c | 20 -------------------- 1 file changed, 20 deletions(-)
drivers/staging/mt7621-mmc/sd.c +0 -20
@@ -216,26 +216,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;
Signature · 1 line
2.17.1
Quoted 11 lines · Nishad Kamdar
Commit
2a54e3259e2a("staging: mt7621-mmc: Remove #if 0 blocks insd.c") does not completely remove an #if 0 block insd.c. This causes the functionmsdc_select_clksrc()which was eariler not compiled, to be compiled. That causes an error -MSDC_CLKSRC_REGis not defined.This patch completely removes the #if 0 block
Reported-by NeilBrown <[email protected]>Fixes 2a54e3259e2a ("staging: mt7621-mmc: Remove #if 0 blocks in sd.c")Signed-off-by Nishad Kamdar <[email protected]>---
Perfect, thanks.
NeilBrown
Quoted 40 lines
Changes in v2:
- Modify commit message
- Include Fixes: and Reported-by: tags--- drivers/staging/mt7621-mmc/sd.c | 20 -------------------- 1 file changed, 20 deletions(-)drivers/staging/mt7621-mmc/sd.c +0
-20@@ -216,26 +216,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; Signature · 1 line
2.17.1