From patchwork Mon May 22 07:38:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 100264 Delivered-To: patches@linaro.org Received: by 10.140.96.100 with SMTP id j91csp128023qge; Mon, 22 May 2017 00:38:49 -0700 (PDT) X-Received: by 10.25.67.81 with SMTP id m17mr4888672lfj.152.1495438729463; Mon, 22 May 2017 00:38:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1495438729; cv=none; d=google.com; s=arc-20160816; b=URdujX8WadC7WV0bmObwxB1GX1jY3XIfMvyBM3ew1y7Qf6BvW7rfbXxB0GO25/Ydky Jssd6zwAd9n/p2B/d9OOGGC60E5X++BOB30p574jXt4Z67W1EPrhmlHvJ3GGcFMGN7xb gX7fVCVLAazqgX6/0OXHv/8RBxvJJVpWqIGK2F0bNI/PmKYZGbuy1hPbWkNEjpGZWp/R bngKM/Py9alu49LQraVgOWfnnhG1GNlTTu9ljcQOe5BFURjqyu53MJ9vu9vM1pJ725HG Cqxum31rl8BqA8Oxehb5+v3W3+MeGS9wnlxVWtijZbQafGaYPBIVcfeAXrBqKKY2882m AbAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=mpJqRoJH5xdUyIzvSlRfGofpUuBwKwJxw9Burz3/xSw=; b=rTYnrtQnRcukLrDA9EDpBYOd4dD1y+xnk8MiqSuXKTfGQeskffqOB2SaJedlMn+JCP NcHBlFXB+vLCAJU9fXRFgr00DoD/RHbwXR5UWXQnRMSjvNkLWaQt1zECqCoBRUX5EGg3 SaGnYmqyY+exoN81pg9b2hIqBiOMDcNmm4l6pgTuIS/CAGl5iPQNkRT87ebacN4bDltd OxahuZTT/jGFsCm3Z4aQARkNy2inXiu8sP6BCoIfEozh1Yf0dfDR4ZHZkVKfzaLSih2a nuDvTfvcJZpuWdvlk/WI7oh9SUjG6pRXg42E0l7kCSRofwGXDjcgjc5bYZ/htxeNEe4f 1Q8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::236 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-lf0-x236.google.com (mail-lf0-x236.google.com. [2a00:1450:4010:c07::236]) by mx.google.com with ESMTPS id s74si7332149lfi.312.2017.05.22.00.38.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 May 2017 00:38:49 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::236 as permitted sender) client-ip=2a00:1450:4010:c07::236; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 2a00:1450:4010:c07::236 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: by mail-lf0-x236.google.com with SMTP id a5so12366861lfh.2 for ; Mon, 22 May 2017 00:38:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=mpJqRoJH5xdUyIzvSlRfGofpUuBwKwJxw9Burz3/xSw=; b=WKrqT2/4WAiyNjzsjXxDIIGSYaioV3txEeQXY/MTlVjQLKhjUoRY+t+WQ3qVNPTA1b IajeuFyHXDd443Vf0ujlai3NM0TMPPZkWxlPRaW4MwKMT+4EailcgvBdxX2kE0ffmb1F Hlb3KLjfSsf0vkn9BzgkblvsEeqs0tOL4VSGE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mpJqRoJH5xdUyIzvSlRfGofpUuBwKwJxw9Burz3/xSw=; b=ifr+q/zjXabYfI65vdA94Bkt6ZD8oF+glzqvaQPjAAPxQ4NPP/Agrahwf5USOQj+fo hzVQsBFhlflfKT+NO22DifZ0kLoYmBWT5hqVOzdm5itObug75RQ0YyfjNfBiQmPl8vJ9 oZ//FJdng+eNvxkugl2TAEbOXLjwrilRoBAgxqn7IIK4vjWMkUBduXiYcVUnMCMHnVQC snmz+Qy4TbZiRUlDFLbS6dULLRiI8eWEG1s5sQJF8HSnCmQHtEdNu9Kkks3YpPgZFMUt 1Osnem6qMZnNRD5KCkChCRvxpJvIC6Lp+hveNvNHmhSBd3w1bVCLGF+HxnRlM8emR3Fd kdwQ== X-Gm-Message-State: AODbwcDaVz2IR5nnlPfnmGjHTm7i7g3sgm08624NO0XfXzZ3RbZLUg0l 7aOTrTf+7EKstTWO92w= X-Received: by 10.25.125.9 with SMTP id y9mr4075991lfc.181.1495438728972; Mon, 22 May 2017 00:38:48 -0700 (PDT) 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 69sm2461429lfr.7.2017.05.22.00.38.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 22 May 2017 00:38:48 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson Cc: Jaehoon Chung , Adrian Hunter , Linus Walleij Subject: [PATCH] mmc: block: Use mmc_send_status() and drop get_card_status() Date: Mon, 22 May 2017 09:38:42 +0200 Message-Id: <1495438722-22091-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.7.4 There are no reason to why the mmc block device driver needs to implements its own version of how to get the status of the card. Current it do so via the static function get_card_status(). Let's instead drop that function and convert to use mmc_send_status() as that is what everybody else is using. Signed-off-by: Ulf Hansson --- drivers/mmc/core/block.c | 22 +++------------------- drivers/mmc/core/mmc_ops.c | 1 + 2 files changed, 4 insertions(+), 19 deletions(-) -- 2.7.4 diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c index e973798..23a3254 100644 --- a/drivers/mmc/core/block.c +++ b/drivers/mmc/core/block.c @@ -127,7 +127,6 @@ MODULE_PARM_DESC(perdev_minors, "Minors numbers to allocate per device"); static inline int mmc_blk_part_switch(struct mmc_card *card, struct mmc_blk_data *md); -static int get_card_status(struct mmc_card *card, u32 *status, int retries); static struct mmc_blk_data *mmc_blk_get(struct gendisk *disk) { @@ -385,7 +384,7 @@ static int ioctl_rpmb_card_status_poll(struct mmc_card *card, u32 *status, return -EINVAL; do { - err = get_card_status(card, status, 5); + err = mmc_send_status(card, status); if (err) break; @@ -885,21 +884,6 @@ static int mmc_sd_num_wr_blocks(struct mmc_card *card, u32 *written_blocks) return 0; } -static int get_card_status(struct mmc_card *card, u32 *status, int retries) -{ - struct mmc_command cmd = {}; - int err; - - cmd.opcode = MMC_SEND_STATUS; - if (!mmc_host_is_spi(card->host)) - cmd.arg = card->rca << 16; - cmd.flags = MMC_RSP_SPI_R2 | MMC_RSP_R1 | MMC_CMD_AC; - err = mmc_wait_for_cmd(card->host, &cmd, retries); - if (err == 0) - *status = cmd.resp[0]; - return err; -} - static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms, bool hw_busy_detect, struct request *req, bool *gen_err) { @@ -908,7 +892,7 @@ static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms, u32 status; do { - err = get_card_status(card, &status, 5); + err = mmc_send_status(card, &status); if (err) { pr_err("%s: error %d requesting status\n", req->rq_disk->disk_name, err); @@ -1076,7 +1060,7 @@ static int mmc_blk_cmd_recovery(struct mmc_card *card, struct request *req, * we can't be sure the returned status is for the r/w command. */ for (retry = 2; retry >= 0; retry--) { - err = get_card_status(card, &status, 0); + err = mmc_send_status(card, &status); if (!err) break; diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c index 78f75f0..ac4b694 100644 --- a/drivers/mmc/core/mmc_ops.c +++ b/drivers/mmc/core/mmc_ops.c @@ -76,6 +76,7 @@ int mmc_send_status(struct mmc_card *card, u32 *status) return 0; } +EXPORT_SYMBOL_GPL(mmc_send_status); static int _mmc_select_card(struct mmc_host *host, struct mmc_card *card) {