aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2011-02-10 10:10:56 -0500
committerChris Ball <cjb@laptop.org>2011-03-15 13:49:23 -0400
commit3383433ce70613514593c940a2ae4e6ab19f2b28 (patch)
tree266dfb9ea4ac15af4d5fa6ef809b880e7a7dd254 /drivers/mmc
parentd7554caa2c3410c07a1889a08c66288edbdc216a (diff)
mmc: tmio_mmc: drop dma_sglen state variable
This variable doesn't seem to be used for anything after the other patches so just drop it. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/tmio_mmc.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index 1b9fa21c2bd..699b6ab209b 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -152,7 +152,6 @@ struct tmio_mmc_host {
152 struct tasklet_struct dma_complete; 152 struct tasklet_struct dma_complete;
153 struct tasklet_struct dma_issue; 153 struct tasklet_struct dma_issue;
154#ifdef CONFIG_TMIO_MMC_DMA 154#ifdef CONFIG_TMIO_MMC_DMA
155 unsigned int dma_sglen;
156 u8 bounce_buf[PAGE_CACHE_SIZE] __attribute__((aligned(MAX_ALIGN))); 155 u8 bounce_buf[PAGE_CACHE_SIZE] __attribute__((aligned(MAX_ALIGN)));
157 struct scatterlist bounce_sg; 156 struct scatterlist bounce_sg;
158#endif 157#endif
@@ -830,11 +829,9 @@ static void tmio_mmc_start_dma_rx(struct tmio_mmc_host *host)
830 } 829 }
831 830
832 ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_FROM_DEVICE); 831 ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_FROM_DEVICE);
833 if (ret > 0) { 832 if (ret > 0)
834 host->dma_sglen = ret;
835 desc = chan->device->device_prep_slave_sg(chan, sg, ret, 833 desc = chan->device->device_prep_slave_sg(chan, sg, ret,
836 DMA_FROM_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); 834 DMA_FROM_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
837 }
838 835
839 if (desc) { 836 if (desc) {
840 desc->callback = tmio_dma_complete; 837 desc->callback = tmio_dma_complete;
@@ -911,11 +908,9 @@ static void tmio_mmc_start_dma_tx(struct tmio_mmc_host *host)
911 } 908 }
912 909
913 ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_TO_DEVICE); 910 ret = dma_map_sg(chan->device->dev, sg, host->sg_len, DMA_TO_DEVICE);
914 if (ret > 0) { 911 if (ret > 0)
915 host->dma_sglen = ret;
916 desc = chan->device->device_prep_slave_sg(chan, sg, ret, 912 desc = chan->device->device_prep_slave_sg(chan, sg, ret,
917 DMA_TO_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK); 913 DMA_TO_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
918 }
919 914
920 if (desc) { 915 if (desc) {
921 desc->callback = tmio_dma_complete; 916 desc->callback = tmio_dma_complete;