[UPDATE PATCH 06/19] drivers/scsi/aic7xxx/aic7xxx_osm: Use the DMA_32BIT_MASK constant

Tobias Klauser
2005-03-20T12:42:13Z

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

Use the DMA_32BIT_MASK constant 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 <tklauser@nuerscht.ch>

--- linux-2.6.11.orig/drivers/scsi/aic7xxx/aic7xxx_osm.c 2005-03-02 12:50:36.000000000 +0100
+++ linux-2.6.11/drivers/scsi/aic7xxx/aic7xxx_osm.c 2005-03-20 13:27:54.000000000 +0100
@@ -138,6 +138,7 @@
#include <linux/mm.h> /* For fetching system memory size */
#include <linux/blkdev.h> /* For block_size() */
#include <linux/delay.h> /* For ssleep/msleep */
+#include <linux/dma-mapping.h>

/*
* Lock protecting manipulation of the ahc softc list.
@@ -1361,7 +1362,7 @@ ahc_dmamem_alloc(struct ahc_softc *ahc,
* our dma mask when doing allocations.
*/
if (ahc->dev_softc != NULL)
- if (pci_set_dma_mask(ahc->dev_softc, 0xFFFFFFFF)) {
+ if (pci_set_dma_mask(ahc->dev_softc, DMA_32BIT_MASK)) {
printk(KERN_WARNING "aic7xxx: No suitable DMA available.\n");
kfree(map);
return (ENODEV);