From patchwork Wed Nov 16 10:51:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 82471 Delivered-To: patches@linaro.org Received: by 10.140.97.165 with SMTP id m34csp82375qge; Wed, 16 Nov 2016 02:51:37 -0800 (PST) X-Received: by 10.55.160.194 with SMTP id j185mr2318744qke.315.1479293497591; Wed, 16 Nov 2016 02:51:37 -0800 (PST) Return-Path: Received: from mail-qt0-x22e.google.com (mail-qt0-x22e.google.com. [2607:f8b0:400d:c0d::22e]) by mx.google.com with ESMTPS id e81si21325694qkb.159.2016.11.16.02.51.37 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Nov 2016 02:51:37 -0800 (PST) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2607:f8b0:400d:c0d::22e as permitted sender) client-ip=2607:f8b0:400d:c0d::22e; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2607:f8b0:400d:c0d::22e as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by mail-qt0-x22e.google.com with SMTP id w33so95824420qtc.3 for ; Wed, 16 Nov 2016 02:51:37 -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=Lk7rAFOx6Wng1uOKOKvkjJbt04d/In0sIsbF0Q+vf7R0VvEQpex88tRgHAAtXz5kpt V9xP8qPAZO8NEne8G8UsJ8aUrWGeG5eWq5TASALxZVG+mYCHFdou59ijLiXY+2pIQIO4 Z/qzb1ICY+zpD7/qjPRFJt+i+SOC86DBpC/7A= 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=XhI3kcioz2orAretzFdZCaaeJtEzcHRlzx0xNDrDXZ3Ojjr6exA+/yKzV20oHkP6jh zsCvfVluya2OCBtQK/RBwDhnSUwgB+QVfK5mhfOYhvuq0O75SkM6D/UUELzFxfhEBEEI 1gVEoQDYacj0P8nm0W0hWHeZ7SYvke0xJ8zMe/vTsZkCX11RSFRz/bOSNoAcbHY0AMtF TBuiZm74UyNL7sCz06BkEgON98NjBFJSoC+NBvVhxezcIptFEUJJKVg1CaEZs8F6woU2 IdyJqbtuq1CSB6C+cIBXqdoZE95Gcc38fljjGJKvRqJlt8SFWVuoUlsoSUdqhqwHhqlJ rH4w== X-Gm-Message-State: ABUngveKlzxq93wpDynqN3yAQtwlKf3RZzc9QbVjogiZZGfq5jX3PET2zAPwhNHvBaGfIb7XCoU= X-Received: by 10.25.215.208 with SMTP id q77mr820195lfi.126.1479293497201; Wed, 16 Nov 2016 02:51:37 -0800 (PST) Return-Path: Received: from uffe-Latitude-E6430s.ideon.se ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id 34sm7711369lja.25.2016.11.16.02.51.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Nov 2016 02:51:35 -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 3/9] mmc: core: Rename ignore_crc to retry_crc_err to reflect its purpose Date: Wed, 16 Nov 2016 11:51:15 +0100 Message-Id: <1479293481-20186-4-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1479293481-20186-1-git-send-email-ulf.hansson@linaro.org> References: <1479293481-20186-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