]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
mmc: sh_mobile_sdhi: remove superfluous check in SCC error check
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Mon, 12 Dec 2016 19:51:25 +0000 (20:51 +0100)
committerUlf Hansson <ulf.hansson@linaro.org>
Mon, 13 Feb 2017 12:19:51 +0000 (13:19 +0100)
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>
drivers/mmc/host/sh_mobile_sdhi.c

index 6e8972b310c1824baab1f1c3e01dee00ee3e30e9..72c2dbc74c9ff24b4bea677fbf5e0ff5deacdab6 100644 (file)
@@ -441,12 +441,7 @@ static int sh_mobile_sdhi_select_tuning(struct tmio_mmc_host *host)
 
 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) &