From patchwork Tue Jun 18 15:34:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 167179 Delivered-To: patches@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4375428ilk; Tue, 18 Jun 2019 08:35:09 -0700 (PDT) X-Received: by 2002:a05:6512:21c:: with SMTP id a28mr14528023lfo.14.1560872109165; Tue, 18 Jun 2019 08:35:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560872109; cv=none; d=google.com; s=arc-20160816; b=W05gJWuTdUVw4XvY9H8q0wRMxxS32yWMI4vXJzo+MKw2MUnAxOd9o0WKkzHfsOk28E 3Vywcu5Z1eUuL0LgBHzDZi7JM05AcNAqKKvnz7J0FoQfkmdqLM590zlqfucxpr9jHP0V vYd7wUx6wa8o1YPGkLvJXIeIJVSs+VBX5+9CZzO70qJxejMTCNUIX7lwNs3KDV1sWcg/ 6ccoNuwy3czSUtribciF5T1vrP4XtGUiJ4xwiGpBpGkKZAN/yGueNPRARamsLVxAOBQ1 liNaDfvStDhz3jMrfRy+TQrkVLMZ6i/w4cdeyh8yqfxHyADM4gMwMkSyt2J0euZPQfde u/+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=TrltWt+RtwnpkQQYwVLsi9uq9P2cQCYA5NaB1ic9l5s=; b=nNmBGvVtGO5X/6bzb5Jyk07k6Au9x0zXkLyZsRW2Iv1c1j6QHQLXNj66HXpNSKqk1w V3uiYC0b4djxRMmvFxdZomqf9Xli0EZLnLJBSiPbagCjZFEltwVcjsI8uJ6GvddPxNKQ d+FG/DBj30Ih5GCngLMfXrAygOYHPYdu5h/vX6M0EuiypO8Nnca6FykBA56/X/KQUAE4 BSHEnrtRHLtYtDNZmKZmbeqJfsLA8k3dbdalFvxz76WCiiIm417rsORHH6TJgtIe7XuY 1JuvjlrZHEmOhZhenu7l3MUYz2GFMT5riuQ2tHVxsIrmeqHbBZP6KxVFnxuxzS2UUAja PIdg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NJtQhNNg; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 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-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id o6sor8346509lji.36.2019.06.18.08.35.09 for (Google Transport Security); Tue, 18 Jun 2019 08:35:09 -0700 (PDT) Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NJtQhNNg; spf=pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=ulf.hansson@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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=TrltWt+RtwnpkQQYwVLsi9uq9P2cQCYA5NaB1ic9l5s=; b=NJtQhNNg78seUtT1XUqdcun+UMhElbfhoNIrmqOJPrg/y7Ye3phqcqBR+aZ98PY7ym zUS1Vbkl7gJo+0odr3yJ5u8RTMX6IrzSFKnETVm9+PgQwUE27CphCmVDe6yrgYsFAe+A vUp+Xg+bcEVLGDGlBNWf6iJoXoKGOvCDpSqPsgD/pvHpgLSzQiptjF3BsGaopi4BMqp+ XFjo3sJS4EJsFBOZwpsS36awBA+3QlazSpplPuyNVvJiLweDSIgfVFA1ryUwTPf7mA7O HRVjx/ouXbr276JXXyh6bEZedldNFLG48LVgbS6Ogn5U+GFfUUTNBtwEZLpg9XIZ3GJz sqrg== 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:in-reply-to :references; bh=TrltWt+RtwnpkQQYwVLsi9uq9P2cQCYA5NaB1ic9l5s=; b=qeSIVlE5ZzPr6H0R1qo1HlEx6jB7bEWK8wrtREn99yOH/S5vjnN1mCu7A7WwcOEfXL mDPRBx3Ukp27cl+Wozmw5ShqVMcXo/vsQGf16diNRVstmNIHLO/qO9wLBFJaPkx7xlDr JFWuMdjc+4G4EOpLj0Sk2lijlPIeuNqQ5ZJJqOEZKReSLBjrB2840uPOcsvMwqXrM62k MCNwmyZePah4JbXm8NGny0KL8OxIaNA9S3puzQrHFVgOqJlAY5NlF2vb3IMsJFMp3hPr Jrng+Egqhf9jdy2mnf5k1exOYa+oDQuoI1PaXOf0ok6JYEOP/Hp4uK2if2U/AaE0tFgK bk/g== X-Gm-Message-State: APjAAAUq4eGCN+BKEAEYUDYtLStTF4c76LlXqIZ/II2Y1HJrpCuRordm /kSpJu+ZqcMU6zyl9xD7LjKUnWeVxO46+w== X-Google-Smtp-Source: APXvYqxung57/e+YH3aN47rF4dI9dtCp6RtpYgXnvVsMJBceOG9OE7z7rJ0srhWqzysCxn/FVJaEtQ== X-Received: by 2002:a2e:9685:: with SMTP id q5mr14919419lji.227.1560872108802; Tue, 18 Jun 2019 08:35:08 -0700 (PDT) Return-Path: Received: from localhost.localdomain (h-158-174-22-210.NA.cust.bahnhof.se. [158.174.22.210]) by smtp.gmail.com with ESMTPSA id d15sm2203121lfq.76.2019.06.18.08.35.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Jun 2019 08:35:08 -0700 (PDT) From: Ulf Hansson To: linux-mmc@vger.kernel.org, Ulf Hansson , Adrian Hunter , Douglas Anderson Cc: Brian Norris , Shawn Lin , Guenter Roeck , Heiko Stuebner , Kalle Valo , Arend Van Spriel , linux-wireless@vger.kernel.org Subject: [PATCH 7/7] mmc: sdio: Drop unused in-parameter from mmc_sdio_init_card() Date: Tue, 18 Jun 2019 17:34:48 +0200 Message-Id: <20190618153448.27145-8-ulf.hansson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190618153448.27145-1-ulf.hansson@linaro.org> References: <20190618153448.27145-1-ulf.hansson@linaro.org> The "powered_resume" in-parameter to mmc_sdio_init_card() has now become redundant as all callers set it to 0. Therefore let's just drop it. Signed-off-by: Ulf Hansson --- drivers/mmc/core/sdio.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) -- 2.17.1 Reviewed-by: Douglas Anderson Tested-by: Douglas Anderson diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index 0bf603670f61..8dd8fc32ecca 100644 --- a/drivers/mmc/core/sdio.c +++ b/drivers/mmc/core/sdio.c @@ -559,7 +559,7 @@ static void mmc_sdio_resend_if_cond(struct mmc_host *host, * we're trying to reinitialise. */ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, - struct mmc_card *oldcard, int powered_resume) + struct mmc_card *oldcard) { struct mmc_card *card; int err; @@ -582,11 +582,9 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, /* * Inform the card of the voltage */ - if (!powered_resume) { - err = mmc_send_io_op_cond(host, ocr, &rocr); - if (err) - goto err; - } + err = mmc_send_io_op_cond(host, ocr, &rocr); + if (err) + goto err; /* * For SPI, enable CRC as appropriate. @@ -645,7 +643,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, * try to init uhs card. sdio_read_cccr will take over this task * to make sure which speed mode should work. */ - if (!powered_resume && (rocr & ocr & R4_18V_PRESENT)) { + if (rocr & ocr & R4_18V_PRESENT) { err = mmc_set_uhs_voltage(host, ocr_card); if (err == -EAGAIN) { mmc_sdio_resend_if_cond(host, card); @@ -659,7 +657,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, /* * For native busses: set card RCA and quit open drain mode. */ - if (!powered_resume && !mmc_host_is_spi(host)) { + if (!mmc_host_is_spi(host)) { err = mmc_send_relative_addr(host, &card->rca); if (err) goto remove; @@ -687,7 +685,7 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr, /* * Select card, as all following commands rely on that. */ - if (!powered_resume && !mmc_host_is_spi(host)) { + if (!mmc_host_is_spi(host)) { err = mmc_select_card(card); if (err) goto remove; @@ -845,7 +843,7 @@ static int mmc_sdio_reinit_card(struct mmc_host *host) if (ret) return ret; - return mmc_sdio_init_card(host, host->card->ocr, host->card, 0); + return mmc_sdio_init_card(host, host->card->ocr, host->card); } /* @@ -1113,7 +1111,7 @@ int mmc_attach_sdio(struct mmc_host *host) /* * Detect and init the card. */ - err = mmc_sdio_init_card(host, rocr, NULL, 0); + err = mmc_sdio_init_card(host, rocr, NULL); if (err) goto err;