summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/sun_esp.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-08-27 18:09:11 -0700
committerDavid S. Miller <davem@davemloft.net>2008-08-29 02:13:15 -0700
commit738f2b7b813913e651f39387d007dd961755dee2 (patch)
tree022ca4d144cba51495e6f26a8f55d3046d16c2e3 /drivers/scsi/sun_esp.c
parent944c67dff7a88f0a775e5b604937f9e30d2de555 (diff)
downloadlinux-738f2b7b813913e651f39387d007dd961755dee2.tar.bz2
sparc: Convert all SBUS drivers to dma_*() interfaces.
And all the SBUS dma interfaces are deleted. A private implementation remains inside of the 32-bit sparc port which exists only for the sake of the implementation of dma_*(). Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/scsi/sun_esp.c')
-rw-r--r--drivers/scsi/sun_esp.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/drivers/scsi/sun_esp.c b/drivers/scsi/sun_esp.c
index 35b6e2ccc394..f7508743f705 100644
--- a/drivers/scsi/sun_esp.c
+++ b/drivers/scsi/sun_esp.c
@@ -9,6 +9,7 @@
#include <linux/module.h>
#include <linux/mm.h>
#include <linux/init.h>
+#include <linux/dma-mapping.h>
#include <asm/irq.h>
#include <asm/io.h>
@@ -101,8 +102,9 @@ static int __devinit esp_sbus_map_command_block(struct esp *esp)
{
struct sbus_dev *sdev = esp->dev;
- esp->command_block = sbus_alloc_consistent(&sdev->ofdev.dev, 16,
- &esp->command_block_dma);
+ esp->command_block = dma_alloc_coherent(&sdev->ofdev.dev, 16,
+ &esp->command_block_dma,
+ GFP_ATOMIC);
if (!esp->command_block)
return -ENOMEM;
return 0;
@@ -225,7 +227,7 @@ static dma_addr_t sbus_esp_map_single(struct esp *esp, void *buf,
{
struct sbus_dev *sdev = esp->dev;
- return sbus_map_single(&sdev->ofdev.dev, buf, sz, dir);
+ return dma_map_single(&sdev->ofdev.dev, buf, sz, dir);
}
static int sbus_esp_map_sg(struct esp *esp, struct scatterlist *sg,
@@ -233,7 +235,7 @@ static int sbus_esp_map_sg(struct esp *esp, struct scatterlist *sg,
{
struct sbus_dev *sdev = esp->dev;
- return sbus_map_sg(&sdev->ofdev.dev, sg, num_sg, dir);
+ return dma_map_sg(&sdev->ofdev.dev, sg, num_sg, dir);
}
static void sbus_esp_unmap_single(struct esp *esp, dma_addr_t addr,
@@ -241,7 +243,7 @@ static void sbus_esp_unmap_single(struct esp *esp, dma_addr_t addr,
{
struct sbus_dev *sdev = esp->dev;
- sbus_unmap_single(&sdev->ofdev.dev, addr, sz, dir);
+ dma_unmap_single(&sdev->ofdev.dev, addr, sz, dir);
}
static void sbus_esp_unmap_sg(struct esp *esp, struct scatterlist *sg,
@@ -249,7 +251,7 @@ static void sbus_esp_unmap_sg(struct esp *esp, struct scatterlist *sg,
{
struct sbus_dev *sdev = esp->dev;
- sbus_unmap_sg(&sdev->ofdev.dev, sg, num_sg, dir);
+ dma_unmap_sg(&sdev->ofdev.dev, sg, num_sg, dir);
}
static int sbus_esp_irq_pending(struct esp *esp)
@@ -558,9 +560,9 @@ static int __devinit esp_sbus_probe_one(struct device *dev,
fail_free_irq:
free_irq(host->irq, esp);
fail_unmap_command_block:
- sbus_free_consistent(&esp_dev->ofdev.dev, 16,
- esp->command_block,
- esp->command_block_dma);
+ dma_free_coherent(&esp_dev->ofdev.dev, 16,
+ esp->command_block,
+ esp->command_block_dma);
fail_unmap_regs:
sbus_iounmap(esp->regs, SBUS_ESP_REG_SIZE);
fail_unlink:
@@ -609,9 +611,9 @@ static int __devexit esp_sbus_remove(struct of_device *dev)
dma_write32(val & ~DMA_INT_ENAB, DMA_CSR);
free_irq(irq, esp);
- sbus_free_consistent(&sdev->ofdev.dev, 16,
- esp->command_block,
- esp->command_block_dma);
+ dma_free_coherent(&sdev->ofdev.dev, 16,
+ esp->command_block,
+ esp->command_block_dma);
sbus_iounmap(esp->regs, SBUS_ESP_REG_SIZE);
of_iounmap(&dma_of->resource[0], esp->dma_regs,
resource_size(&dma_of->resource[0]));