diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2007-10-24 09:01:09 +0200 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2007-10-24 09:01:09 +0200 |
| commit | bd6dee6f30a0f6943df190b387b5f8fe98a848f3 (patch) | |
| tree | d15e1e0ea7b649cbc3f160392f68b1e6bb89e58e /drivers/mmc | |
| parent | 5a1cb47ff4c3fbc8ebdb53c3e4f2a1dec466b339 (diff) | |
| download | op-kernel-dev-bd6dee6f30a0f6943df190b387b5f8fe98a848f3.zip op-kernel-dev-bd6dee6f30a0f6943df190b387b5f8fe98a848f3.tar.gz | |
mmc: sg fallout
Do a full scan of the directory to try and be a bit more proactive,
instead of waiting for things to break.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/au1xmmc.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/mmci.c | 6 | ||||
| -rw-r--r-- | drivers/mmc/host/pxamci.c | 1 | ||||
| -rw-r--r-- | drivers/mmc/host/sdhci.c | 2 | ||||
| -rw-r--r-- | drivers/mmc/host/wbsd.c | 2 |
5 files changed, 5 insertions, 8 deletions
diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c index bcbb6d2..c77fadc 100644 --- a/drivers/mmc/host/au1xmmc.c +++ b/drivers/mmc/host/au1xmmc.c @@ -40,13 +40,13 @@ #include <linux/mm.h> #include <linux/interrupt.h> #include <linux/dma-mapping.h> +#include <scatterlist/scatterlist.h> #include <linux/mmc/host.h> #include <asm/io.h> #include <asm/mach-au1x00/au1000.h> #include <asm/mach-au1x00/au1xxx_dbdma.h> #include <asm/mach-au1x00/au1100_mmc.h> -#include <asm/scatterlist.h> #include <au1xxx.h> #include "au1xmmc.h" diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index d0eb0a2..95244a7 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c @@ -20,11 +20,11 @@ #include <linux/mmc/host.h> #include <linux/amba/bus.h> #include <linux/clk.h> +#include <linux/scatterlist.h> #include <asm/cacheflush.h> #include <asm/div64.h> #include <asm/io.h> -#include <asm/scatterlist.h> #include <asm/sizes.h> #include <asm/mach/mmc.h> @@ -167,7 +167,7 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data, * partially written to a page is properly coherent. */ if (host->sg_len && data->flags & MMC_DATA_READ) - flush_dcache_page(host->sg_ptr->page); + flush_dcache_page(sg_page(host->sg_ptr)); } if (status & MCI_DATAEND) { mmci_stop_data(host); @@ -319,7 +319,7 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id) * page, ensure that the data cache is coherent. */ if (status & MCI_RXACTIVE) - flush_dcache_page(host->sg_ptr->page); + flush_dcache_page(sg_page(host->sg_ptr)); if (!mmci_next_sg(host)) break; diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 0601e01..a25ee71 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c @@ -29,7 +29,6 @@ #include <asm/dma.h> #include <asm/io.h> -#include <asm/scatterlist.h> #include <asm/sizes.h> #include <asm/arch/pxa-regs.h> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index d7c5b94..6b80bf7 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -17,8 +17,6 @@ #include <linux/mmc/host.h> -#include <asm/scatterlist.h> - #include "sdhci.h" #define DRIVER_NAME "sdhci" diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c index fa4c8c5..4d5f374 100644 --- a/drivers/mmc/host/wbsd.c +++ b/drivers/mmc/host/wbsd.c @@ -33,10 +33,10 @@ #include <linux/pnp.h> #include <linux/highmem.h> #include <linux/mmc/host.h> +#include <linux/scatterlist.h> #include <asm/io.h> #include <asm/dma.h> -#include <asm/scatterlist.h> #include "wbsd.h" |
