Skip to content

Commit

Permalink
ARM: mmci: no need to call flush_dcache_page() with sg_miter API
Browse files Browse the repository at this point in the history
The sg_miter API provides the required cache maintainence, so we don't
need to do that ourselves.  Remove the unnecessary additional cache
maintainence.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Feb 4, 2011
1 parent c8afc9d commit 7d7aa23
Showing 1 changed file with 0 additions and 19 deletions.
19 changes: 0 additions & 19 deletions drivers/mmc/host/mmci.c
Original file line number Diff line number Diff line change
Expand Up @@ -311,22 +311,6 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data,
data->error = -EIO;
}
host->data_xfered = round_down(success, data->blksz);

/*
* We hit an error condition. Ensure that any data
* partially written to a page is properly coherent.
*/
if (data->flags & MMC_DATA_READ) {
struct sg_mapping_iter *sg_miter = &host->sg_miter;
unsigned long flags;

local_irq_save(flags);
if (sg_miter_next(sg_miter)) {
flush_dcache_page(sg_miter->page);
sg_miter_stop(sg_miter);
}
local_irq_restore(flags);
}
}

if (status & MCI_DATABLOCKEND)
Expand Down Expand Up @@ -510,9 +494,6 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id)
if (remain)
break;

if (status & MCI_RXACTIVE)
flush_dcache_page(sg_miter->page);

status = readl(base + MMCISTATUS);
} while (1);

Expand Down

0 comments on commit 7d7aa23

Please sign in to comment.