aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc/kernel
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-26 23:00:58 -0700
committerDavid S. Miller <davem@davemloft.net>2008-08-29 02:13:13 -0700
commit260489fa8a9735c76073ace95f03ffaf10cca884 (patch)
tree5cc56f69ba16de24886bb8fbab34f2404554ce31 /arch/sparc/kernel
parent7a715f46012f3552294154978aed59cba9804928 (diff)
sparc32: Make mmu_{get,release}_*() take a struct device pointer.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel')
-rw-r--r--arch/sparc/kernel/ioport.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index aa73b3b71e8..11dccf94515 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -394,8 +394,6 @@ void sbus_free_consistent(struct device *dev, long n, void *p, u32 ba)
*/
dma_addr_t sbus_map_single(struct device *dev, void *va, size_t len, int direction)
{
- struct sbus_dev *sdev = to_sbus_device(dev);
-
/* XXX why are some lengths signed, others unsigned? */
if (len <= 0) {
return 0;
@@ -404,20 +402,17 @@ dma_addr_t sbus_map_single(struct device *dev, void *va, size_t len, int directi
if (len > 256*1024) { /* __get_free_pages() limit */
return 0;
}
- return mmu_get_scsi_one(va, len, sdev->bus);
+ return mmu_get_scsi_one(dev, va, len);
}
void sbus_unmap_single(struct device *dev, dma_addr_t ba, size_t n, int direction)
{
- struct sbus_dev *sdev = to_sbus_device(dev);
- mmu_release_scsi_one(ba, n, sdev->bus);
+ mmu_release_scsi_one(dev, ba, n);
}
int sbus_map_sg(struct device *dev, struct scatterlist *sg, int n, int direction)
{
- struct sbus_dev *sdev = to_sbus_device(dev);
-
- mmu_get_scsi_sgl(sg, n, sdev->bus);
+ mmu_get_scsi_sgl(dev, sg, n);
/*
* XXX sparc64 can return a partial length here. sun4c should do this
@@ -428,9 +423,7 @@ int sbus_map_sg(struct device *dev, struct scatterlist *sg, int n, int direction
void sbus_unmap_sg(struct device *dev, struct scatterlist *sg, int n, int direction)
{
- struct sbus_dev *sdev = to_sbus_device(dev);
-
- mmu_release_scsi_sgl(sg, n, sdev->bus);
+ mmu_release_scsi_sgl(dev, sg, n);
}
/*
@@ -438,7 +431,6 @@ void sbus_unmap_sg(struct device *dev, struct scatterlist *sg, int n, int direct
void sbus_dma_sync_single_for_cpu(struct device *dev, dma_addr_t ba, size_t size, int direction)
{
#if 0
- struct sbus_dev *sdev = to_sbus_device(dev);
unsigned long va;
struct resource *res;
@@ -459,7 +451,6 @@ void sbus_dma_sync_single_for_cpu(struct device *dev, dma_addr_t ba, size_t size
void sbus_dma_sync_single_for_device(struct device *dev, dma_addr_t ba, size_t size, int direction)
{
#if 0
- struct sbus_dev *sdev = to_sbus_device(dev);
unsigned long va;
struct resource *res;