drivers/net/chelsio/cxgb2: Use the DMA_{32,

diff -urpN -X dontdiff linux-2.6.12-rc5-mm2/drivers/net/chelsio/cxgb2.c linux-2.6.12-rc5-mm2~dma_mask/drivers/net/chelsio/cxgb2.c
@@ -50,6 +50,7 @@
 #include <linux/proc_fs.h>
 #include <linux/version.h>
 #include <linux/workqueue.h>
+#include <linux/dma-mapping.h>
 #include <asm/uaccess.h>
 
 #include "ch_ethtool.h"

@@ -84,9 +85,6 @@ static char driver_name[]    = DRV_NAME;
 static char driver_string[]  = "Chelsio " DRV_TYPE "Network Driver";
 static char driver_version[] = "2.1.0";
 
-#define PCI_DMA_64BIT ~0ULL
-#define PCI_DMA_32BIT 0xffffffffULL
-
 #define MAX_CMDQ_ENTRIES 16384
 #define MAX_CMDQ1_ENTRIES 1024
 #define MAX_RX_BUFFERS 16384

@@ -1006,15 +1004,15 @@ static int __devinit init_one(struct pci
 		goto out_disable_pdev;
 	}
 
-	if (!pci_set_dma_mask(pdev, PCI_DMA_64BIT)) {
+	if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
 		pci_using_dac = 1;
-		if (pci_set_consistent_dma_mask(pdev, PCI_DMA_64BIT)) {
+		if (pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK)) {
 			CH_ERR("%s: unable to obtain 64-bit DMA for"
 			       "consistent allocations\n", pci_name(pdev));
 			err = -ENODEV;
 			goto out_disable_pdev;
 		}
-	} else if ((err = pci_set_dma_mask(pdev, PCI_DMA_32BIT)) != 0) {
+	} else if ((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) != 0) {
 		CH_ERR("%s: no usable DMA configuration\n", pci_name(pdev));
 		goto out_disable_pdev;
 	}