Skip to contentSkip to conversation

drivers/net/s2io: Use the DMA_{64,

PATCH New Tobias Klauser 1 participant 1 message Mar 19, 2005

Subsystems (2)
Network drivers Kernel janitors
lore
Share & tools
lore

Tobias Klauser

author
#0 lore raw

PATCH 6/16 drivers/net/s2io: Use the DMA_{64,

The previous patch did not compile cleanly on all architectures so here's a fixed one.

Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling pci_set_dma_mask() or pci_set_consistent_dma_mask()
This patch includes dma-mapping.h explicitly because it caused errors on some architectures otherwise.
See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details

Signed-off-by Tobias Klauser <[email protected]>
drivers/net/s2io.c +4 -3
@@ -42,6 +42,7 @@
 #include<linux/errno.h>
 #include<linux/ioport.h>
 #include<linux/pci.h>
+#include<linux/dma-mapping.h>
 #include<linux/kernel.h>
 #include<linux/netdevice.h>
 #include<linux/etherdevice.h>

@@ -4631,19 +4632,19 @@ s2io_init_nic(struct pci_dev *pdev, cons
 		return ret;
 	}
 
-	if (!pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) {
+	if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
 		DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 64bit DMA\n");
 		dma_flag = TRUE;
 
 		if (pci_set_consistent_dma_mask
-		    (pdev, 0xffffffffffffffffULL)) {
+		    (pdev, DMA_64BIT_MASK)) {
 			DBG_PRINT(ERR_DBG,
 				  "Unable to obtain 64bit DMA for \
 					consistent allocations\n");
 			pci_disable_device(pdev);
 			return -ENOMEM;
 		}
-	} else if (!pci_set_dma_mask(pdev, 0xffffffffUL)) {
+	} else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
 		DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 32bit DMA\n");
 	} else {
 		pci_disable_device(pdev);

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors