scsi: 3w-xxx: fully convert to the generic DMA API

The driver is currently using an odd mix of legacy PCI DMA API and
generic DMA API calls, switch it over to the generic API entirely.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Adam Radford <aradford@gmail.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

2 files changed, 14 insertions, 7 deletions

diff --git a/drivers/scsi/3w-xxxx.c b/drivers/scsi/3w-xxxx.c
index 471366945bd4..a58257645e94 100644
--- a/drivers/scsi/3w-xxxx.c
+++ b/drivers/scsi/3w-xxxx.c
@@ -834,15 +834,17 @@ static int tw_allocate_memory(TW_Device_Extension *tw_dev, int size, int which)
 
         dprintk(KERN_NOTICE "3w-xxxx: tw_allocate_memory()\n");
 
-        cpu_addr = pci_alloc_consistent(tw_dev->tw_pci_dev, size*TW_Q_LENGTH, &dma_handle);
+        cpu_addr = dma_alloc_coherent(&tw_dev->tw_pci_dev->dev,
+                        size * TW_Q_LENGTH, &dma_handle, GFP_KERNEL);
         if (cpu_addr == NULL) {
-                printk(KERN_WARNING "3w-xxxx: pci_alloc_consistent() failed.\n");
+                printk(KERN_WARNING "3w-xxxx: dma_alloc_coherent() failed.\n");
                 return 1;
         }
 
         if ((unsigned long)cpu_addr % (tw_dev->tw_pci_dev->device == TW_DEVICE_ID ? TW_ALIGNMENT_6000 : TW_ALIGNMENT_7000)) {
                 printk(KERN_WARNING "3w-xxxx: Couldn't allocate correctly aligned memory.\n");
-                pci_free_consistent(tw_dev->tw_pci_dev, size*TW_Q_LENGTH, cpu_addr, dma_handle);
+                dma_free_coherent(&tw_dev->tw_pci_dev->dev, size * TW_Q_LENGTH,
+                                cpu_addr, dma_handle);
                 return 1;
         }
 
@@ -1062,10 +1064,16 @@ static void tw_free_device_extension(TW_Device_Extension *tw_dev)
 
         /* Free command packet and generic buffer memory */
         if (tw_dev->command_packet_virtual_address[0])
-                pci_free_consistent(tw_dev->tw_pci_dev, sizeof(TW_Command)*TW_Q_LENGTH, tw_dev->command_packet_virtual_address[0], tw_dev->command_packet_physical_address[0]);
+                dma_free_coherent(&tw_dev->tw_pci_dev->dev,
+                                sizeof(TW_Command) * TW_Q_LENGTH,
+                                tw_dev->command_packet_virtual_address[0],
+                                tw_dev->command_packet_physical_address[0]);
 
         if (tw_dev->alignment_virtual_address[0])
-                pci_free_consistent(tw_dev->tw_pci_dev, sizeof(TW_Sector)*TW_Q_LENGTH, tw_dev->alignment_virtual_address[0], tw_dev->alignment_physical_address[0]);
+                dma_free_coherent(&tw_dev->tw_pci_dev->dev,
+                                sizeof(TW_Sector) * TW_Q_LENGTH,
+                                tw_dev->alignment_virtual_address[0],
+                                tw_dev->alignment_physical_address[0]);
 } /* End tw_free_device_extension() */
 
 /* This function will send an initconnection command to controller */
@@ -2260,7 +2268,7 @@ static int tw_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id)
 
         pci_set_master(pdev);
 
-        retval = pci_set_dma_mask(pdev, TW_DMA_MASK);
+        retval = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
         if (retval) {
                 printk(KERN_WARNING "3w-xxxx: Failed to set dma mask.");
                 goto out_disable_device;
diff --git a/drivers/scsi/3w-xxxx.h b/drivers/scsi/3w-xxxx.h
index 69e80c1ed1ca..bd87fbacfbc7 100644
--- a/drivers/scsi/3w-xxxx.h
+++ b/drivers/scsi/3w-xxxx.h
@@ -230,7 +230,6 @@ static unsigned char tw_sense_table[][4] =
 #define TW_IOCTL_TIMEOUT                      25 /* 25 seconds */
 #define TW_IOCTL_CHRDEV_TIMEOUT               60 /* 60 seconds */
 #define TW_IOCTL_CHRDEV_FREE                  -1
-#define TW_DMA_MASK                           DMA_BIT_MASK(32)
 #define TW_MAX_CDB_LEN                        16
 
 /* Bitmask macros to eliminate bitfields */