From patchwork Tue Nov 22 20:56:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 83501 Delivered-To: patches@linaro.org Received: by 10.140.97.165 with SMTP id m34csp2310897qge; Tue, 22 Nov 2016 12:56:25 -0800 (PST) X-Received: by 10.28.168.137 with SMTP id r131mr4043557wme.16.1479848185718; Tue, 22 Nov 2016 12:56:25 -0800 (PST) Return-Path: Received: from mail-wm0-x22b.google.com (mail-wm0-x22b.google.com. [2a00:1450:400c:c09::22b]) by mx.google.com with ESMTPS id h188si4499422wma.91.2016.11.22.12.56.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Nov 2016 12:56:25 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:400c:c09::22b as permitted sender) client-ip=2a00:1450:400c:c09::22b; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:400c:c09::22b as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-wm0-x22b.google.com with SMTP id a197so46218301wmd.0 for ; Tue, 22 Nov 2016 12:56:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Tg4b8220R4a0SJ7RkdGyYLLI+zDVN80t0Gm2nJQJt9c=; b=Se1lTczepYv9GdxPEOPuWpU0qRHaSbwTGRIh869s1zf7CEGA35d72qo6ksa5EH2MLW j5JgS3qCiyJUzgCpb1A11ZFHBnUdbSGrbq84Jb5wUI4UQKtBt6XHf49vjlY1FO7PmlAy SK4xPwNshWaJWAhJmytpHIFzpDEtC4hDnKVUE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Tg4b8220R4a0SJ7RkdGyYLLI+zDVN80t0Gm2nJQJt9c=; b=W1S2btFf/pzb1ctc7nvfptuDaKhe9mvdvZcfX4DrEJyEkfT1J6mt3guBSH/PtcHwmf 8ROJ9Rlu1yDNBs7pp/72KWGoQl9USMgcslyw3mJhNUYG/F4rXk+dp/SNM6msRbFPkmAg rld59xTLDEVqILL623DixXe3EVvTqjpQcLuH0L/luOiiuSAIH8NXcQCy6l9nbmefvxon N4DFxFb31uNP6LKqmvx/fEYEZqmQZbq40PKYKwRLtOum6Ll65ASZOx20+/653jX0RJvK GTIPd0aO/OybcgfiHgtPcOTg9RDBMG3XaXt5xpZkBAMX/tDNBbF7NRTDsr0FU2k64Jwa 61xQ== X-Gm-Message-State: AKaTC036/KfqEJil2RGIDruAyfJ0bOGF8Dt9sUiPjr+VYavUeK3Uahdi+48LAOxPWLZgeDN1wEg= X-Received: by 10.25.137.87 with SMTP id l84mr5226740lfd.144.1479848185298; Tue, 22 Nov 2016 12:56:25 -0800 (PST) Return-Path: Received: from localhost.localdomain (h-155-4-221-67.na.cust.bahnhof.se. [155.4.221.67]) by smtp.gmail.com with ESMTPSA id 196sm6619988lff.3.2016.11.22.12.56.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Nov 2016 12:56:24 -0800 (PST) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Jaehoon Chung , Adrian Hunter , Linus Walleij , Chaotian Jing , Stephen Boyd , Michael Walle , Yong Mao , Shawn Lin Subject: [PATCH v2 3/7] mmc: core: Rename ignore_crc to retry_crc_err to reflect its purpose Date: Tue, 22 Nov 2016 21:56:09 +0100 Message-Id: <1479848173-20881-4-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1479848173-20881-1-git-send-email-ulf.hansson@linaro.org> References: <1479848173-20881-1-git-send-email-ulf.hansson@linaro.org> The ignore_crc parameter/variable name is used at a couple of places in the mmc core. Let's rename it to retry_crc_err to reflect its new purpose. Signed-off-by: Ulf Hansson --- drivers/mmc/core/mmc_ops.c | 10 +++++----- drivers/mmc/core/mmc_ops.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) -- 1.9.1 diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index 0515748..214e734 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -461,7 +461,7 @@ int mmc_switch_status(struct mmc_card *card) } static int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, - bool send_status, bool ignore_crc) + bool send_status, bool retry_crc_err) { struct mmc_host *host = card->host; int err; @@ -496,7 +496,7 @@ static int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, busy = host->ops->card_busy(host); } else { err = mmc_send_status(card, &status); - if (ignore_crc && err == -EILSEQ) + if (retry_crc_err && err == -EILSEQ) busy = true; else if (err) return err; @@ -528,13 +528,13 @@ static int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms, * timeout of zero implies maximum possible timeout * @use_busy_signal: use the busy signal as response type * @send_status: send status cmd to poll for busy - * @ignore_crc: ignore CRC errors when sending status cmd to poll for busy + * @retry_crc_err: retry when CRC errors when polling with CMD13 for busy * * Modifies the EXT_CSD register for selected card. */ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, unsigned int timeout_ms, bool use_busy_signal, bool send_status, - bool ignore_crc) + bool retry_crc_err) { struct mmc_host *host = card->host; int err; @@ -590,7 +590,7 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, } /* Let's try to poll to find out when the command is completed. */ - err = mmc_poll_for_busy(card, timeout_ms, send_status, ignore_crc); + err = mmc_poll_for_busy(card, timeout_ms, send_status, retry_crc_err); out: mmc_retune_release(host); diff --git a/drivers/mmc/core/mmc_ops.h b/drivers/mmc/core/mmc_ops.h index 7f6c0e9..9fccddb 100644 --- a/drivers/mmc/core/mmc_ops.h +++ b/drivers/mmc/core/mmc_ops.h @@ -30,7 +30,7 @@ int mmc_switch_status(struct mmc_card *card); int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, unsigned int timeout_ms, bool use_busy_signal, bool send_status, - bool ignore_crc); + bool retry_crc_err); #endif