diff options
author | David S. Miller <davem@davemloft.net> | 2008-08-27 21:37:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-08-29 05:13:12 -0400 |
commit | 7a715f46012f3552294154978aed59cba9804928 (patch) | |
tree | 9e7079ae4ad370b63ac6c8a4face573d6cf60533 /drivers/net/sunlance.c | |
parent | 5778002874de0fb7e3d8c4a0a4afb6b1a6297069 (diff) |
sparc: Make SBUS DMA interfaces take struct device.
This is the first step in converting all the SBUS drivers
over to generic dma_*().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sunlance.c')
-rw-r--r-- | drivers/net/sunlance.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index 24ffecb1ce23..4f4baf9f4ec8 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c | |||
@@ -1283,7 +1283,7 @@ static void lance_free_hwresources(struct lance_private *lp) | |||
1283 | sbus_iounmap(lp->init_block_iomem, | 1283 | sbus_iounmap(lp->init_block_iomem, |
1284 | sizeof(struct lance_init_block)); | 1284 | sizeof(struct lance_init_block)); |
1285 | } else if (lp->init_block_mem) { | 1285 | } else if (lp->init_block_mem) { |
1286 | sbus_free_consistent(lp->sdev, | 1286 | sbus_free_consistent(&lp->sdev->ofdev.dev, |
1287 | sizeof(struct lance_init_block), | 1287 | sizeof(struct lance_init_block), |
1288 | lp->init_block_mem, | 1288 | lp->init_block_mem, |
1289 | lp->init_block_dvma); | 1289 | lp->init_block_dvma); |
@@ -1384,7 +1384,8 @@ static int __devinit sparc_lance_probe_one(struct sbus_dev *sdev, | |||
1384 | lp->tx = lance_tx_pio; | 1384 | lp->tx = lance_tx_pio; |
1385 | } else { | 1385 | } else { |
1386 | lp->init_block_mem = | 1386 | lp->init_block_mem = |
1387 | sbus_alloc_consistent(sdev, sizeof(struct lance_init_block), | 1387 | sbus_alloc_consistent(&sdev->ofdev.dev, |
1388 | sizeof(struct lance_init_block), | ||
1388 | &lp->init_block_dvma); | 1389 | &lp->init_block_dvma); |
1389 | if (!lp->init_block_mem || lp->init_block_dvma == 0) { | 1390 | if (!lp->init_block_mem || lp->init_block_dvma == 0) { |
1390 | printk(KERN_ERR "SunLance: Cannot allocate consistent DMA memory.\n"); | 1391 | printk(KERN_ERR "SunLance: Cannot allocate consistent DMA memory.\n"); |