| From bce42a1c5866608e60c00657a72a683c461be0f5 Mon Sep 17 00:00:00 2001 |
| From: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Date: Mon, 12 Dec 2016 20:51:25 +0100 |
| Subject: [PATCH 150/255] mmc: sh_mobile_sdhi: remove superfluous check in SCC |
| error check |
| |
| The function will only be available if SDR104 was detected in probe, |
| so no need to check in the function itself again. |
| |
| Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> |
| Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> |
| (cherry picked from commit 03c5b0d90300fc725fc1fb644872b522483a2d7e) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| drivers/mmc/host/sh_mobile_sdhi.c | 7 +------ |
| 1 file changed, 1 insertion(+), 6 deletions(-) |
| |
| --- a/drivers/mmc/host/sh_mobile_sdhi.c |
| +++ b/drivers/mmc/host/sh_mobile_sdhi.c |
| @@ -441,12 +441,7 @@ static int sh_mobile_sdhi_select_tuning( |
| |
| static bool sh_mobile_sdhi_check_scc_error(struct tmio_mmc_host *host) |
| { |
| - struct sh_mobile_sdhi *priv; |
| - |
| - if (!(host->mmc->caps & MMC_CAP_UHS_SDR104)) |
| - return 0; |
| - |
| - priv = host_to_priv(host); |
| + struct sh_mobile_sdhi *priv = host_to_priv(host); |
| |
| /* Check SCC error */ |
| if (sd_scc_read32(host, priv, SH_MOBILE_SDHI_SCC_RVSCNTL) & |
