mmc: sdhci-esdhc-imx: merge the same register check into one place

Dong Aisheng · storulf · commit 915be485bdf2 · 2015-06-01T09:07:15.000+02:00
In esdhc_writel_le() function, there's duplicated checking of the same
register as follows:
"if (unlikely(reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE))".
Merge them into one and remove the duplicated one.

Signed-off-by: Dong Aisheng &lt;aisheng.dong@freescale.com&gt;
Signed-off-by: Ulf Hansson &lt;ulf.hansson@linaro.org&gt;
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -313,6 +313,11 @@ static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg)
 			data |= ESDHC_CTRL_D3CD;
 			writel(data, host->ioaddr + SDHCI_HOST_CONTROL);
 		}
+
+		if (val & SDHCI_INT_ADMA_ERROR) {
+			val &= ~SDHCI_INT_ADMA_ERROR;
+			val |= ESDHC_INT_VENDOR_SPEC_DMA_ERR;
+		}
 	}
 
 	if (unlikely((imx_data->socdata->flags & ESDHC_FLAG_MULTIBLK_NO_INT)
@@ -333,13 +338,6 @@ static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg)
 			}
 	}
 
-	if (unlikely(reg == SDHCI_INT_ENABLE || reg == SDHCI_SIGNAL_ENABLE)) {
-		if (val & SDHCI_INT_ADMA_ERROR) {
-			val &= ~SDHCI_INT_ADMA_ERROR;
-			val |= ESDHC_INT_VENDOR_SPEC_DMA_ERR;
-		}
-	}
-
 	writel(val, host->ioaddr + reg);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -313,6 +313,11 @@ static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg)`
`313`	`313`	`data \|= ESDHC_CTRL_D3CD;`
`314`	`314`	`writel(data, host->ioaddr + SDHCI_HOST_CONTROL);`
`315`	`315`	`}`
	`316`	`+`
	`317`	`+ if (val & SDHCI_INT_ADMA_ERROR) {`
	`318`	`+ val &= ~SDHCI_INT_ADMA_ERROR;`
	`319`	`+ val \|= ESDHC_INT_VENDOR_SPEC_DMA_ERR;`
	`320`	`+ }`
`316`	`321`	`}`
`317`	`322`
`318`	`323`	`if (unlikely((imx_data->socdata->flags & ESDHC_FLAG_MULTIBLK_NO_INT)`
`@@ -333,13 +338,6 @@ static void esdhc_writel_le(struct sdhci_host *host, u32 val, int reg)`
`333`	`338`	`}`
`334`	`339`	`}`
`335`	`340`
`336`		`- if (unlikely(reg == SDHCI_INT_ENABLE \|\| reg == SDHCI_SIGNAL_ENABLE)) {`
`337`		`- if (val & SDHCI_INT_ADMA_ERROR) {`
`338`		`- val &= ~SDHCI_INT_ADMA_ERROR;`
`339`		`- val \|= ESDHC_INT_VENDOR_SPEC_DMA_ERR;`
`340`		`- }`
`341`		`- }`
`342`		`-`
`343`	`341`	`writel(val, host->ioaddr + reg);`
`344`	`342`	`}`
`345`	`343`