[dahdi-commits] sruffell: linux/trunk r6838 - in /linux/trunk: drivers/dahdi/wctc4xxp/ includ...

[SVN commits to the DAHDI project]

Author: sruffell
Date: Mon Jul 13 09:33:39 2009
New Revision: 6838

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=6838
Log:
wctc4xxp: Remove deprecated DMA_xxBIT_MASK usage.

Modified:
    linux/trunk/drivers/dahdi/wctc4xxp/base.c
    linux/trunk/include/dahdi/kernel.h

Modified: linux/trunk/drivers/dahdi/wctc4xxp/base.c
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/drivers/dahdi/wctc4xxp/base.c?view=diff&rev=6838&r1=6837&r2=6838
==============================================================================
--- linux/trunk/drivers/dahdi/wctc4xxp/base.c (original)
+++ linux/trunk/drivers/dahdi/wctc4xxp/base.c Mon Jul 13 09:33:39 2009
@@ -3475,7 +3475,7 @@
 
 	init_waitqueue_head(&wc->waitq);
 
-	if (pci_set_dma_mask(wc->pdev, DMA_32BIT_MASK)) {
+	if (pci_set_dma_mask(wc->pdev, DMA_BIT_MASK(32))) {
 		release_region(wc->iobase, 0xff);
 		DTE_PRINTK(WARNING, "No suitable DMA available.\n");
 		return -EIO;

Modified: linux/trunk/include/dahdi/kernel.h
URL: http://svn.asterisk.org/svn-view/dahdi/linux/trunk/include/dahdi/kernel.h?view=diff&rev=6838&r1=6837&r2=6838
==============================================================================
--- linux/trunk/include/dahdi/kernel.h (original)
+++ linux/trunk/include/dahdi/kernel.h Mon Jul 13 09:33:39 2009
@@ -1167,4 +1167,8 @@
 #define kzalloc(a, b) kcalloc(1, a, b)
 #endif
 
+#ifndef DMA_BIT_MASK
+#define DMA_BIT_MASK(n)	(((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
+#endif
+
 #endif /* _DAHDI_KERNEL_H */