Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 915be485 authored by Dong Aisheng's avatar Dong Aisheng Committed by Ulf Hansson
Browse files

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



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: default avatarDong Aisheng <aisheng.dong@freescale.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent b69587e2

drivers/mmc/host/sdhci-esdhc-imx.c

+5 −7
Original line number Diff line number Diff line
@@ -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);

}