git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Driver core: convert mmc code to use struct device
[pandora-kernel.git]
/
drivers
/
mmc
/
wbsd.c
diff --git
a/drivers/mmc/wbsd.c
b/drivers/mmc/wbsd.c
index
ced309b
..
682e62b
100644
(file)
--- a/
drivers/mmc/wbsd.c
+++ b/
drivers/mmc/wbsd.c
@@
-1488,7
+1488,7
@@
static void __devinit wbsd_request_dma(struct wbsd_host *host, int dma)
/*
* Translate the address to a physical address.
*/
/*
* Translate the address to a physical address.
*/
- host->dma_addr = dma_map_single(
host->mmc->dev
, host->dma_buffer,
+ host->dma_addr = dma_map_single(
mmc_dev(host->mmc)
, host->dma_buffer,
WBSD_DMA_SIZE, DMA_BIDIRECTIONAL);
/*
WBSD_DMA_SIZE, DMA_BIDIRECTIONAL);
/*
@@
-1512,7
+1512,7
@@
kfree:
*/
BUG_ON(1);
*/
BUG_ON(1);
- dma_unmap_single(
host->mmc->dev
, host->dma_addr,
+ dma_unmap_single(
mmc_dev(host->mmc)
, host->dma_addr,
WBSD_DMA_SIZE, DMA_BIDIRECTIONAL);
host->dma_addr = (dma_addr_t)NULL;
WBSD_DMA_SIZE, DMA_BIDIRECTIONAL);
host->dma_addr = (dma_addr_t)NULL;
@@
-1530,7
+1530,7
@@
err:
static void __devexit wbsd_release_dma(struct wbsd_host *host)
{
if (host->dma_addr) {
static void __devexit wbsd_release_dma(struct wbsd_host *host)
{
if (host->dma_addr) {
- dma_unmap_single(
host->mmc->dev
, host->dma_addr,
+ dma_unmap_single(
mmc_dev(host->mmc)
, host->dma_addr,
WBSD_DMA_SIZE, DMA_BIDIRECTIONAL);
}
kfree(host->dma_buffer);
WBSD_DMA_SIZE, DMA_BIDIRECTIONAL);
}
kfree(host->dma_buffer);