From: Ludovic Barre <ludovic.Barre@st.com>
To: Ulf Hansson <ulf.hansson@linaro.org>, Rob Herring <robh+dt@kernel.org>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
benjamin.gaignard@linaro.org, Gerald Baeza <gerald.baeza@st.com>,
Loic Pallardy <loic.pallardy@st.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-mmc@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
Ludovic Barre <ludovic.barre@st.com>
Subject: [PATCH V4 04/25] mmc: mmci: merge prepare data functions
Date: Tue, 2 Oct 2018 14:09:06 +0200 [thread overview]
Message-ID: <1538482167-13819-5-git-send-email-ludovic.Barre@st.com> (raw)
In-Reply-To: <1538482167-13819-1-git-send-email-ludovic.Barre@st.com>
From: Ludovic Barre <ludovic.barre@st.com>
This patch merges the prepare data functions.
This allows to define a single access to prepare data service.
This prepares integration for mmci host ops.
Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
---
drivers/mmc/host/mmci.c | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index cf0f482..392fb59 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -672,10 +672,14 @@ static int __mmci_dma_prep_data(struct mmci_host *host, struct mmc_data *data,
}
static inline int mmci_dma_prep_data(struct mmci_host *host,
- struct mmc_data *data)
+ struct mmc_data *data,
+ bool next)
{
struct mmci_dmae_priv *dmae = host->dma_priv;
+ struct mmci_dmae_next *nd = &dmae->next_data;
+ if (next)
+ return __mmci_dma_prep_data(host, data, &nd->chan, &nd->desc);
/* Check if next job is already prepared. */
if (dmae->cur && dmae->desc_current)
return 0;
@@ -685,15 +689,6 @@ static inline int mmci_dma_prep_data(struct mmci_host *host,
&dmae->desc_current);
}
-static inline int mmci_dma_prep_next(struct mmci_host *host,
- struct mmc_data *data)
-{
- struct mmci_dmae_priv *dmae = host->dma_priv;
- struct mmci_dmae_next *nd = &dmae->next_data;
-
- return __mmci_dma_prep_data(host, data, &nd->chan, &nd->desc);
-}
-
static int mmci_dma_start_data(struct mmci_host *host, unsigned int datactrl)
{
int ret;
@@ -703,7 +698,7 @@ static int mmci_dma_start_data(struct mmci_host *host, unsigned int datactrl)
if (!host->use_dma)
return -EINVAL;
- ret = mmci_dma_prep_data(host, host->data);
+ ret = mmci_dma_prep_data(host, host->data, false);
if (ret)
return ret;
@@ -763,7 +758,7 @@ static void mmci_pre_request(struct mmc_host *mmc, struct mmc_request *mrq)
if (mmci_validate_data(host, data))
return;
- if (!mmci_dma_prep_next(host, data))
+ if (!mmci_dma_prep_data(host, data, true))
data->host_cookie = ++host->next_cookie < 0 ?
1 : host->next_cookie;
}
--
2.7.4
next prev parent reply other threads:[~2018-10-02 12:09 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-02 12:09 [PATCH V4 00/25] mmc: mmci: add sdmmc variant for stm32 Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 01/25] mmc: mmci: Change struct members from bool to u8 Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 02/25] mmc: mmci: create generic mmci_dma_setup Ludovic Barre
2018-10-03 9:22 ` Ulf Hansson
2018-10-03 11:44 ` Ludovic BARRE
2018-10-02 12:09 ` [PATCH V4 03/25] mmc: mmci: introduce dma_priv pointer to mmci_host Ludovic Barre
2018-10-02 12:09 ` Ludovic Barre [this message]
2018-10-02 12:09 ` [PATCH V4 05/25] mmc: mmci: add prepare/unprepare_data callbacks Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 06/25] mmc: mmci: add get_next_data callback Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 07/25] mmc: mmci: add dma_release callback Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 08/25] mmc: mmci: add dma_start callback Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 09/25] mmc: mmci: add dma_finalize callback Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 10/25] mmc: mmci: add dma_error callback Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 11/25] mmc: mmci: add validate_data callback Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 12/25] mmc: mmci: add set_clk/pwrreg callbacks Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 13/25] mmc: mmci: add datactrl block size variant property Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 14/25] mmc: mmci: expand startbiterr to irqmask and error check Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 15/25] mmc: mmci: add variant properties to define cpsm & cmdresp bits Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 16/25] mmc: mmci: add variant property to define dpsm bit Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 17/25] mmc: mmci: add variant property to define irq pio mask Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 18/25] mmc: mmci: add variant property to write datactrl before command Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 19/25] mmc: mmci: add variant property to not read datacnt Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 20/25] dt-bindings: mmci: add optional reset property Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 21/25] mmc: " Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 22/25] mmc: mmci: add clock divider for stm32 sdmmc Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 23/25] mmc: mmci: add stm32 sdmmc registers Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 24/25] dt-bindings: mmci: add stm32 sdmmc variant Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 25/25] mmc: " Ludovic Barre
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=1538482167-13819-5-git-send-email-ludovic.Barre@st.com \
--to=ludovic.barre@st.com \
--cc=alexandre.torgue@st.com \
--cc=benjamin.gaignard@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=gerald.baeza@st.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=loic.pallardy@st.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=robh+dt@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).