From patchwork Thu Aug 25 07:04:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 74654 Delivered-To: patch@linaro.org Received: by 10.140.29.52 with SMTP id a49csp690728qga; Thu, 25 Aug 2016 00:04:11 -0700 (PDT) X-Received: by 10.28.103.6 with SMTP id b6mr6572729wmc.89.1472108651128; Thu, 25 Aug 2016 00:04:11 -0700 (PDT) Return-Path: Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id qp15si12374927wjb.256.2016.08.25.00.04.10; Thu, 25 Aug 2016 00:04:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) client-ip=85.214.87.163; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com; spf=pass (google.com: best guess record for domain of u-boot-bounces@lists.denx.de designates 85.214.87.163 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id C3D3AA7558; Thu, 25 Aug 2016 09:03:23 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HLl2Upi6G4Gn; Thu, 25 Aug 2016 09:03:23 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 26565A7599; Thu, 25 Aug 2016 09:03:02 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 246C74B9F9 for ; Thu, 25 Aug 2016 09:02:46 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E82JD1wpEvzt for ; Thu, 25 Aug 2016 09:02:46 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from conuserg-08.nifty.com (conuserg-08.nifty.com [210.131.2.75]) by theia.denx.de (Postfix) with ESMTPS id 4B8374B9CB for ; Thu, 25 Aug 2016 09:02:44 +0200 (CEST) Received: from beagle.diag.org (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-08.nifty.com with ESMTP id u7P72PXn002611; Thu, 25 Aug 2016 16:02:27 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com u7P72PXn002611 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1472108548; bh=AgsRVcnril0xFEXi55lxdpqeRbC7HxhiWah3eyGWe6g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ch/dYEDmDQhN6oiy0wJFPMCdEC1ZQ7oy29urXeTCWXi2ML1AtMN7IkJT1+648HqxM Ts07jJ1RU5JZjVOWs3KzNepzpF5GdZnxoqV6YH6hQDGkYmGeJUBl+29DW2xk+uzqpL Pkv9aFXE9uR5aX9j4gStxEyCZ1Ktkc3XVaxJzFhmqYsXAdYzZaE5DExgvQVZ3+lCLw 36ob7T24bT3FZ+pfuzIq4bSN9tT6XZ2GZkOTi/BT5nNeXKAJudWp/npevBEs2xoVd0 EfT8avdK7BK87RSqi2wQu+9x3v8F2PV29jk9ZOKWYnRoak8N7AnmUJujYH6EqXwD7r 7CG7FbNONRpRA== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: u-boot@lists.denx.de Date: Thu, 25 Aug 2016 16:04:22 +0900 Message-Id: <1472108663-17156-6-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1472108663-17156-1-git-send-email-yamada.masahiro@socionext.com> References: <1472108663-17156-1-git-send-email-yamada.masahiro@socionext.com> Subject: [U-Boot] [PATCH 5/6] mmc: sdhci: drop CONFIG_ from CONFIG_SDHCI_CMD_DEFAULT_TIME X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" 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 --- drivers/mmc/sdhci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 1.9.1 _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index da73653..d486082 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -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;