[1/6] mmc: mmci: Don't share un-implemented DMA functions

Message ID	20190306140456.28187-2-ulf.hansson@linaro.org
State	New
Headers	show Delivered-To: patches@linaro.org 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; From: Ulf Hansson <ulf.hansson@linaro.org> To: linux-mmc@vger.kernel.org, Ludovic Barre <ludovic.barre@st.com> Cc: Russell King <linux@armlinux.org.uk>, Linus Walleij <linus.walleij@linaro.org>, Ulf Hansson <ulf.hansson@linaro.org> Subject: [PATCH 1/6] mmc: mmci: Don't share un-implemented DMA functions Date: Wed, 6 Mar 2019 15:04:51 +0100 Message-Id: <20190306140456.28187-2-ulf.hansson@linaro.org> In-Reply-To: <20190306140456.28187-1-ulf.hansson@linaro.org> References: <20190306140456.28187-1-ulf.hansson@linaro.org>
Series	mmc: mmci: Cleanup some variant related code \| expand [0/6] mmc: mmci: Cleanup some variant related code [1/6] mmc: mmci: Don't share un-implemented DMA functions [2/6] mmc: mmci: Drop unnecessary clear of variant->qcom_dml flag [3/6] mmc: mmci: Re-work code starting DMA for the qcom variant [4/6] mmc: mmci: Drop qcom specific header file [5/6] mmc: mmci: Share sdmmc_variant_init() via the common header file [6/6] mmc: mmci: Make mmci_variant_init() static

Message ID

20190306140456.28187-2-ulf.hansson@linaro.org

State

New

Headers

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; 
From: Ulf Hansson <ulf.hansson@linaro.org>
To: linux-mmc@vger.kernel.org,
	Ludovic Barre <ludovic.barre@st.com>
Cc: Russell King <linux@armlinux.org.uk>,
	Linus Walleij <linus.walleij@linaro.org>,
	Ulf Hansson <ulf.hansson@linaro.org>
Subject: [PATCH 1/6] mmc: mmci: Don't share un-implemented DMA functions
Date: Wed,  6 Mar 2019 15:04:51 +0100
Message-Id: <20190306140456.28187-2-ulf.hansson@linaro.org>
In-Reply-To: <20190306140456.28187-1-ulf.hansson@linaro.org>
References: <20190306140456.28187-1-ulf.hansson@linaro.org>

Series

mmc: mmci: Cleanup some variant related code | expand

Commit Message

Ulf Hansson March 6, 2019, 2:04 p.m. UTC

Some of the DMA functions are shared via mmci.h, however they are not
implemented unless CONFIG_DMA_ENGINE is set. Therefore, add that constraint
to the header file as well.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

---
 drivers/mmc/host/mmci.h | 2 ++
 1 file changed, 2 insertions(+)

-- 
2.17.1

diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index 14df81054438..b368ed3acc29 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -429,6 +429,7 @@  struct mmci_host {
 void mmci_write_clkreg(struct mmci_host *host, u32 clk);
 void mmci_write_pwrreg(struct mmci_host *host, u32 pwr);
 
+#ifdef CONFIG_DMA_ENGINE
 int mmci_dmae_prep_data(struct mmci_host *host, struct mmc_data *data,
 			bool next);
 void mmci_dmae_unprep_data(struct mmci_host *host, struct mmc_data *data,
@@ -439,3 +440,4 @@  void mmci_dmae_release(struct mmci_host *host);
 int mmci_dmae_start(struct mmci_host *host, unsigned int *datactrl);
 void mmci_dmae_finalize(struct mmci_host *host, struct mmc_data *data);
 void mmci_dmae_error(struct mmci_host *host);
+#endif

[1/6] mmc: mmci: Don't share un-implemented DMA functions

Commit Message

Patch