summaryrefslogtreecommitdiffstats
path: root/arch/ppc/8xx_io
diff options
context:
space:
mode:
authorAristeu Sergio Rozanski Filho <aris@conectiva.com.br>2005-08-07 09:42:33 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-07 10:00:39 -0700
commitfc007ddd609ccfce1cd392e65eed05aba8db32ce (patch)
treeb903127fe65626cb75287c0104e5d2ab96f0d876 /arch/ppc/8xx_io
parent8b0ed2fbdbea3f0d34404f1cbfdf02c4a673ca56 (diff)
downloadop-kernel-dev-fc007ddd609ccfce1cd392e65eed05aba8db32ce.zip
op-kernel-dev-fc007ddd609ccfce1cd392e65eed05aba8db32ce.tar.gz
[PATCH] ppc32: 8xx: using dma_alloc_coherent() instead consistent_alloc()
8xx: using dma_alloc_coherent() instead consistent_alloc() Signed-off-by: Aristeu Sergio Rozanski Filho <aris@conectiva.com.br> Signed-off-by: Marcelo Tosatti <marcelo.tosatti@cyclades.com> Cc: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/8xx_io')
-rw-r--r--arch/ppc/8xx_io/fec.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/ppc/8xx_io/fec.c b/arch/ppc/8xx_io/fec.c
index 33ff297..8a9a76c 100644
--- a/arch/ppc/8xx_io/fec.c
+++ b/arch/ppc/8xx_io/fec.c
@@ -1575,7 +1575,7 @@ static int __init fec_enet_init(void)
struct fec_enet_private *fep;
int i, j, k, err;
unsigned char *eap, *iap, *ba;
- unsigned long mem_addr;
+ dma_addr_t mem_addr;
volatile cbd_t *bdp;
cbd_t *cbd_base;
volatile immap_t *immap;
@@ -1640,7 +1640,8 @@ static int __init fec_enet_init(void)
printk("FEC initialization failed.\n");
return 1;
}
- cbd_base = (cbd_t *)consistent_alloc(GFP_KERNEL, PAGE_SIZE, &mem_addr);
+ cbd_base = (cbd_t *)dma_alloc_coherent(dev->class_dev.dev, PAGE_SIZE,
+ &mem_addr, GFP_KERNEL);
/* Set receive and transmit descriptor base.
*/
@@ -1657,7 +1658,10 @@ static int __init fec_enet_init(void)
/* Allocate a page.
*/
- ba = (unsigned char *)consistent_alloc(GFP_KERNEL, PAGE_SIZE, &mem_addr);
+ ba = (unsigned char *)dma_alloc_coherent(dev->class_dev.dev,
+ PAGE_SIZE,
+ &mem_addr,
+ GFP_KERNEL);
/* BUG: no check for failure */
/* Initialize the BD for every fragment in the page.
OpenPOWER on IntegriCloud