[PATCH] drivers/scsi/megaraid.c: use DMA_{32,64}BIT_MASK From: Tobias Klauser Signed-off-by: Tobias Klauser Signed-off-by: Domen Puncer Signed-off-by: Alexey Dobriyan Index: linux-kj/drivers/scsi/megaraid.c =================================================================== --- linux-kj.orig/drivers/scsi/megaraid.c 2005-12-05 13:18:00.000000000 +0300 +++ linux-kj/drivers/scsi/megaraid.c 2005-12-05 13:19:21.000000000 +0300 @@ -44,6 +44,7 @@ #include #include #include +#include #include #include "scsi.h" @@ -2093,7 +2094,7 @@ make_local_pdev(adapter_t *adapter, stru memcpy(*pdev, adapter->dev, sizeof(struct pci_dev)); - if( pci_set_dma_mask(*pdev, 0xffffffff) != 0 ) { + if( pci_set_dma_mask(*pdev, DMA_32BIT_MASK) != 0 ) { kfree(*pdev); return -1; } @@ -4858,10 +4859,10 @@ megaraid_probe_one(struct pci_dev *pdev, /* Set the Mode of addressing to 64 bit if we can */ if ((adapter->flag & BOARD_64BIT) && (sizeof(dma_addr_t) == 8)) { - pci_set_dma_mask(pdev, 0xffffffffffffffffULL); + pci_set_dma_mask(pdev, DMA_64BIT_MASK); adapter->has_64bit_addr = 1; } else { - pci_set_dma_mask(pdev, 0xffffffff); + pci_set_dma_mask(pdev, DMA_32BIT_MASK); adapter->has_64bit_addr = 0; }