mmc: sdhci: drop CONFIG_ from CONFIG_SDHCI_CMD_DEFAULT_TIME
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 25 Aug 2016 07:07:38 +0000 (16:07 +0900)
committerJaehoon Chung <jh80.chung@samsung.com>
Mon, 19 Sep 2016 21:46:01 +0000 (06:46 +0900)
This CONFIG is not configurable since it is not guarded by #ifndef.
Nobody has complained about that, so there is no need to keep it as
a CONFIG option.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
drivers/mmc/sdhci.c

index da73653ffa5e88688aed26e80c8b84720fa2ea45..d48608269dee4e58701b03c5266d07c315949edc 100644 (file)
@@ -127,7 +127,7 @@ static int sdhci_transfer_data(struct sdhci_host *host, struct mmc_data *data,
 #ifndef CONFIG_SDHCI_CMD_MAX_TIMEOUT
 #define CONFIG_SDHCI_CMD_MAX_TIMEOUT           3200
 #endif
-#define CONFIG_SDHCI_CMD_DEFAULT_TIMEOUT       100
+#define SDHCI_CMD_DEFAULT_TIMEOUT              100
 #define SDHCI_READ_STATUS_TIMEOUT              1000
 
 #ifdef CONFIG_DM_MMC_OPS
@@ -151,7 +151,7 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
        unsigned start = get_timer(0);
 
        /* Timeout unit - ms */
-       static unsigned int cmd_timeout = CONFIG_SDHCI_CMD_DEFAULT_TIMEOUT;
+       static unsigned int cmd_timeout = SDHCI_CMD_DEFAULT_TIMEOUT;
 
        sdhci_writel(host, SDHCI_INT_ALL_MASK, SDHCI_INT_STATUS);
        mask = SDHCI_CMD_INHIBIT | SDHCI_DATA_INHIBIT;