All of lore.kernel.org
 help / color / mirror / Atom feed
From: Adrian Hunter <adrian.hunter@intel.com>
To: Ulf Hansson <ulf.hansson@linaro.org>
Cc: Kamal Dasu <kdasu.kdev@gmail.com>,
	Al Cooper <alcooperx@gmail.com>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Orson Zhai <orsonzhai@gmail.com>,
	Baolin Wang <baolin.wang@linux.alibaba.com>,
	Chunyan Zhang <zhang.lyra@gmail.com>, Ray Jui <rjui@broadcom.com>,
	Scott Branden <sbranden@broadcom.com>,
	Jisheng Zhang <jszhang@kernel.org>, Marek Vasut <marex@denx.de>,
	linux-mmc@vger.kernel.org
Subject: [PATCH 4/6] mmc: sdhci-pxav3: Replace SDHCI_QUIRK_MISSING_CAPS
Date: Fri, 13 Jan 2023 13:00:09 +0200	[thread overview]
Message-ID: <20230113110011.129835-5-adrian.hunter@intel.com> (raw)
In-Reply-To: <20230113110011.129835-1-adrian.hunter@intel.com>

SDHCI_QUIRK_MISSING_CAPS is not needed because sdhci_read_caps() can be
called instead.

In preparation to get rid of SDHCI_QUIRK_MISSING_CAPS, replace
SDHCI_QUIRK_MISSING_CAPS with sdhci_read_caps().

__sdhci_read_caps() is also called from sdhci_setup_host() via
sdhci_read_caps(), however only the first call to __sdhci_read_caps() does
anything because after that host->read_caps has been set to true.

Note, __sdhci_read_caps() does more than just set host->caps, such as do a
reset, so calling __sdhci_read_caps() earlier could have unforeseen
side-effects. However the code flow has been reviewed with that in mind.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
---
 drivers/mmc/host/sdhci-pxav3.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c
index a6d89a3f1946..e39dcc998772 100644
--- a/drivers/mmc/host/sdhci-pxav3.c
+++ b/drivers/mmc/host/sdhci-pxav3.c
@@ -124,10 +124,8 @@ static int armada_38x_quirks(struct platform_device *pdev,
 	struct resource *res;
 
 	host->quirks &= ~SDHCI_QUIRK_CAP_CLOCK_BASE_BROKEN;
-	host->quirks |= SDHCI_QUIRK_MISSING_CAPS;
 
-	host->caps = sdhci_readl(host, SDHCI_CAPABILITIES);
-	host->caps1 = sdhci_readl(host, SDHCI_CAPABILITIES_1);
+	sdhci_read_caps(host);
 
 	res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
 					   "conf-sdio3");
-- 
2.34.1


  parent reply	other threads:[~2023-01-13 11:11 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-13 11:00 [PATCH 0/6] mmc: sdhci: Remove SDHCI_QUIRK_MISSING_CAPS Adrian Hunter
2023-01-13 11:00 ` [PATCH 1/6] mmc: sdhci-pci: Replace SDHCI_QUIRK_MISSING_CAPS for Ricoh controller Adrian Hunter
2023-01-13 11:00 ` [PATCH 2/6] mmc: sdhci-brcmstb: Replace SDHCI_QUIRK_MISSING_CAPS Adrian Hunter
2023-01-13 18:35   ` Florian Fainelli
2023-01-13 11:00 ` [PATCH 3/6] mmc: sdhci-sprd: " Adrian Hunter
2023-01-16  1:48   ` Chunyan Zhang
2023-01-13 11:00 ` Adrian Hunter [this message]
2023-01-15 13:03   ` [PATCH 4/6] mmc: sdhci-pxav3: " Jisheng Zhang
2023-01-13 11:00 ` [PATCH 5/6] mmc: sdhci-iproc: " Adrian Hunter
2023-01-13 17:34   ` Scott Branden
2023-01-13 11:00 ` [PATCH 6/6] mmc: sdhci: Remove SDHCI_QUIRK_MISSING_CAPS Adrian Hunter
2023-01-16 12:16 ` [PATCH 0/6] " Ulf Hansson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230113110011.129835-5-adrian.hunter@intel.com \
    --to=adrian.hunter@intel.com \
    --cc=alcooperx@gmail.com \
    --cc=baolin.wang@linux.alibaba.com \
    --cc=f.fainelli@gmail.com \
    --cc=jszhang@kernel.org \
    --cc=kdasu.kdev@gmail.com \
    --cc=linux-mmc@vger.kernel.org \
    --cc=marex@denx.de \
    --cc=orsonzhai@gmail.com \
    --cc=rjui@broadcom.com \
    --cc=sbranden@broadcom.com \
    --cc=ulf.hansson@linaro.org \
    --cc=zhang.lyra@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.