aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sunqe.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-27 21:37:58 -0400
committerDavid S. Miller <davem@davemloft.net>2008-08-29 05:13:12 -0400
commit7a715f46012f3552294154978aed59cba9804928 (patch)
tree9e7079ae4ad370b63ac6c8a4face573d6cf60533 /drivers/net/sunqe.c
parent5778002874de0fb7e3d8c4a0a4afb6b1a6297069 (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/sunqe.c')
-rw-r--r--drivers/net/sunqe.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index e811331d4608..ac8049cab247 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -879,10 +879,10 @@ static int __devinit qec_ether_init(struct sbus_dev *sdev)
879 goto fail; 879 goto fail;
880 } 880 }
881 881
882 qe->qe_block = sbus_alloc_consistent(qe->qe_sdev, 882 qe->qe_block = sbus_alloc_consistent(&qe->qe_sdev->ofdev.dev,
883 PAGE_SIZE, 883 PAGE_SIZE,
884 &qe->qblock_dvma); 884 &qe->qblock_dvma);
885 qe->buffers = sbus_alloc_consistent(qe->qe_sdev, 885 qe->buffers = sbus_alloc_consistent(&qe->qe_sdev->ofdev.dev,
886 sizeof(struct sunqe_buffers), 886 sizeof(struct sunqe_buffers),
887 &qe->buffers_dvma); 887 &qe->buffers_dvma);
888 if (qe->qe_block == NULL || qe->qblock_dvma == 0 || 888 if (qe->qe_block == NULL || qe->qblock_dvma == 0 ||
@@ -926,12 +926,12 @@ fail:
926 if (qe->mregs) 926 if (qe->mregs)
927 sbus_iounmap(qe->mregs, MREGS_REG_SIZE); 927 sbus_iounmap(qe->mregs, MREGS_REG_SIZE);
928 if (qe->qe_block) 928 if (qe->qe_block)
929 sbus_free_consistent(qe->qe_sdev, 929 sbus_free_consistent(&qe->qe_sdev->ofdev.dev,
930 PAGE_SIZE, 930 PAGE_SIZE,
931 qe->qe_block, 931 qe->qe_block,
932 qe->qblock_dvma); 932 qe->qblock_dvma);
933 if (qe->buffers) 933 if (qe->buffers)
934 sbus_free_consistent(qe->qe_sdev, 934 sbus_free_consistent(&qe->qe_sdev->ofdev.dev,
935 sizeof(struct sunqe_buffers), 935 sizeof(struct sunqe_buffers),
936 qe->buffers, 936 qe->buffers,
937 qe->buffers_dvma); 937 qe->buffers_dvma);
@@ -957,11 +957,11 @@ static int __devexit qec_sbus_remove(struct of_device *dev)
957 957
958 sbus_iounmap(qp->qcregs, CREG_REG_SIZE); 958 sbus_iounmap(qp->qcregs, CREG_REG_SIZE);
959 sbus_iounmap(qp->mregs, MREGS_REG_SIZE); 959 sbus_iounmap(qp->mregs, MREGS_REG_SIZE);
960 sbus_free_consistent(qp->qe_sdev, 960 sbus_free_consistent(&qp->qe_sdev->ofdev.dev,
961 PAGE_SIZE, 961 PAGE_SIZE,
962 qp->qe_block, 962 qp->qe_block,
963 qp->qblock_dvma); 963 qp->qblock_dvma);
964 sbus_free_consistent(qp->qe_sdev, 964 sbus_free_consistent(&qp->qe_sdev->ofdev.dev,
965 sizeof(struct sunqe_buffers), 965 sizeof(struct sunqe_buffers),
966 qp->buffers, 966 qp->buffers,
967 qp->buffers_dvma); 967 qp->buffers_dvma);