From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tobias Klauser Subject: [UPDATE PATCH 15/19] drivers/scsi/megaraid: Use the DMA_{64, 32}BIT_MASK constants Date: Sun, 20 Mar 2005 14:14:18 +0100 Message-ID: <20050320131418.GO3491@localhost.localdomain> References: <20050220171028.GP14375@helium.tklauser.home> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Received: from server3.hostpoint.ch ([217.26.52.13]:23052 "EHLO server3.hostpoint.ch") by vger.kernel.org with ESMTP id S261208AbVCTNOV (ORCPT ); Sun, 20 Mar 2005 08:14:21 -0500 Content-Disposition: inline In-Reply-To: <20050220171028.GP14375@helium.tklauser.home> Sender: linux-scsi-owner@vger.kernel.org List-Id: linux-scsi@vger.kernel.org To: kernel-janitors@lists.osdl.org Cc: linux-scsi@vger.kernel.org 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 --- linux-2.6.11.orig/drivers/scsi/megaraid.c 2005-03-02 12:50:36.000000000 +0100 +++ linux-2.6.11/drivers/scsi/megaraid.c 2005-03-20 13:27:54.000000000 +0100 @@ -43,6 +43,7 @@ #include #include #include +#include #include #include "scsi.h" @@ -2060,7 +2061,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; } @@ -4854,10 +4855,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; }