From: Per Forlin per.forlin@linaro.org
Move dmaengine dependent host->next_data variable from mmci_probe to mmci_dma_setup. The mmci fails to compile without CONFIG_DMA_ENGINE if using next_data in mmci_probe.
Signed-off-by: Per Forlin per.forlin@linaro.org --- drivers/mmc/host/mmci.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index f8c837b..04b9856 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -213,6 +213,9 @@ static void __devinit mmci_dma_setup(struct mmci_host *host) return; }
+ /* initialize pre request cookie */ + host->next_data.cookie = 1; + /* Try to acquire a generic DMA engine slave channel */ dma_cap_zero(mask); dma_cap_set(DMA_SLAVE, mask); @@ -1123,8 +1126,6 @@ static int __devinit mmci_probe(struct amba_device *dev, host->gpio_cd = -ENOSYS; host->gpio_cd_irq = -1;
- host->next_data.cookie = 1; - host->hw_designer = amba_manf(dev); host->hw_revision = amba_rev(dev); dev_dbg(mmc_dev(mmc), "designer ID = 0x%02x\n", host->hw_designer);
-
Per Forlin