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

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

[Nishad Kamdar]

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>
---
Changes in v2:
 - Modify commit message
 - Include Fixes: and Reported-by: tags
---
 drivers/staging/mt7621-mmc/sd.c | 20 --------------------
 1 file changed, 20 deletions(-)

diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
index 7b66f9b0a094..3d918e481bd8 100644
--- a/drivers/staging/mt7621-mmc/sd.c
+++ b/drivers/staging/mt7621-mmc/sd.c
@@ -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;
-- 
2.17.1

Re: [PATCH v2] staging: mt7621-mmc: Fix incompletely removed #if 0 block in sd.c

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 1856 bytes --]

On Thu, Dec 06 2018, Nishad Kamdar wrote:

> 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>
> ---

Perfect, thanks.
 Reviewed-by: NeilBrown <neil@brown.name>

NeilBrown


> Changes in v2:
>  - Modify commit message
>  - Include Fixes: and Reported-by: tags
> ---
>  drivers/staging/mt7621-mmc/sd.c | 20 --------------------
>  1 file changed, 20 deletions(-)
>
> diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
> index 7b66f9b0a094..3d918e481bd8 100644
> --- a/drivers/staging/mt7621-mmc/sd.c
> +++ b/drivers/staging/mt7621-mmc/sd.c
> @@ -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;
> -- 
> 2.17.1

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]