Commit bd6dee6f authored by Jens Axboe's avatar Jens Axboe
Browse files

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: default avatarJens Axboe <jens.axboe@oracle.com>
parent 5a1cb47f

drivers/mmc/host/au1xmmc.c

+1 −1
Original line number Diff line number Diff line
@@ -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"

drivers/mmc/host/mmci.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/mmc/host/pxamci.c

+0 −1
Original line number Diff line number Diff line
@@ -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>

drivers/mmc/host/sdhci.c

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 


#include <linux/mmc/host.h>



#include <asm/scatterlist.h>



#include "sdhci.h"



#define DRIVER_NAME "sdhci"

drivers/mmc/host/wbsd.c

+1 −1
Original line number Diff line number Diff line
@@ -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"