From: Faiz Abbas <faiz_abbas@ti.com>
To: linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org,
devicetree@vger.kernel.org, linux-mmc@vger.kernel.org
Cc: adrian.hunter@intel.com, kishon@ti.com, mark.rutland@arm.com,
robh+dt@kernel.org, ulf.hansson@linaro.org, faiz_abbas@ti.com,
tony@atomide.com
Subject: [PATCH v5 06/10] mmc: sdhci: Refactor sdhci_set_timeout()
Date: Thu, 16 Jan 2020 16:21:50 +0530 [thread overview]
Message-ID: <20200116105154.7685-7-faiz_abbas@ti.com> (raw)
In-Reply-To: <20200116105154.7685-1-faiz_abbas@ti.com>
Refactor sdhci_set_timeout() such that platform drivers can do some
functionality in a set_timeout() callback and then call
__sdhci_set_timeout() to complete the operation.
Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
---
drivers/mmc/host/sdhci.c | 36 +++++++++++++++++++-----------------
drivers/mmc/host/sdhci.h | 1 +
2 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 37561333fda4..104203addd70 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1004,27 +1004,29 @@ void sdhci_set_data_timeout_irq(struct sdhci_host *host, bool enable)
}
EXPORT_SYMBOL_GPL(sdhci_set_data_timeout_irq);
-static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
+void __sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
{
- u8 count;
+ bool too_big = false;
+ u8 count = sdhci_calc_timeout(host, cmd, &too_big);
- if (host->ops->set_timeout) {
- host->ops->set_timeout(host, cmd);
- } else {
- bool too_big = false;
-
- count = sdhci_calc_timeout(host, cmd, &too_big);
+ if (too_big &&
+ host->quirks2 & SDHCI_QUIRK2_DISABLE_HW_TIMEOUT) {
+ sdhci_calc_sw_timeout(host, cmd);
+ sdhci_set_data_timeout_irq(host, false);
+ } else if (!(host->ier & SDHCI_INT_DATA_TIMEOUT)) {
+ sdhci_set_data_timeout_irq(host, true);
+ }
- if (too_big &&
- host->quirks2 & SDHCI_QUIRK2_DISABLE_HW_TIMEOUT) {
- sdhci_calc_sw_timeout(host, cmd);
- sdhci_set_data_timeout_irq(host, false);
- } else if (!(host->ier & SDHCI_INT_DATA_TIMEOUT)) {
- sdhci_set_data_timeout_irq(host, true);
- }
+ sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL);
+}
+EXPORT_SYMBOL_GPL(__sdhci_set_timeout);
- sdhci_writeb(host, count, SDHCI_TIMEOUT_CONTROL);
- }
+static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
+{
+ if (host->ops->set_timeout)
+ host->ops->set_timeout(host, cmd);
+ else
+ __sdhci_set_timeout(host, cmd);
}
static void sdhci_initialize_data(struct sdhci_host *host,
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 928c6f35fcad..1fe230c2ed84 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -804,5 +804,6 @@ void sdhci_send_tuning(struct sdhci_host *host, u32 opcode);
void sdhci_abort_tuning(struct sdhci_host *host, u32 opcode);
void sdhci_switch_external_dma(struct sdhci_host *host, bool en);
void sdhci_set_data_timeout_irq(struct sdhci_host *host, bool enable);
+void __sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd);
#endif /* __SDHCI_HW_H */
--
2.19.2
next prev parent reply other threads:[~2020-01-16 10:51 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-16 10:51 [PATCH v5 00/10] Port am335x and am437x devices to sdhci-omap Faiz Abbas
2020-01-16 10:51 ` [PATCH v5 01/10] dt-bindings: sdhci-omap: Add properties for using external dma Faiz Abbas
2020-01-16 10:51 ` [PATCH v5 04/10] mmc: sdhci-omap: Add " Faiz Abbas
2020-01-16 10:51 ` [PATCH v5 05/10] mmc: sdhci: Convert sdhci_set_timeout_irq() to non-static Faiz Abbas
2020-01-16 10:51 ` Faiz Abbas [this message]
2020-01-16 10:51 ` [PATCH v5 07/10] mmc: sdhci-omap: Disable data timeout interrupt during erase Faiz Abbas
2020-01-16 10:51 ` [PATCH v5 08/10] dt-bindings: sdhci-omap: Add am335x and am437x specific bindings Faiz Abbas
[not found] ` <20200116105154.7685-1-faiz_abbas-l0cyMroinI0@public.gmane.org>
2020-01-16 10:51 ` [PATCH v5 02/10] mmc: sdhci: Factor out some operations set to their own functions Faiz Abbas
2020-01-16 10:51 ` [PATCH v5 03/10] mmc: sdhci: add support for using external DMA devices Faiz Abbas
2020-01-16 10:51 ` [PATCH v5 09/10] mmc: sdhci-omap: Add am335x and am437x specific compatibles Faiz Abbas
2020-01-16 10:51 ` [PATCH v5 10/10] mmc: sdhci-omap: Add special reset capability Faiz Abbas
2020-01-16 15:37 ` [PATCH v5 00/10] Port am335x and am437x devices to sdhci-omap 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=20200116105154.7685-7-faiz_abbas@ti.com \
--to=faiz_abbas@ti.com \
--cc=adrian.hunter@intel.com \
--cc=devicetree@vger.kernel.org \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=tony@atomide.com \
--cc=ulf.hansson@linaro.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox