From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tobias Klauser Subject: [UPDATE PATCH 03/19] drivers/scsi/aacraid/linit: Use the DMA_32BIT_MASK constant Date: Sun, 20 Mar 2005 13:35:30 +0100 Message-ID: <20050320123530.GC3491@localhost.localdomain> References: <20050220165420.GC14375@helium.tklauser.home> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Received: from server3.hostpoint.ch ([217.26.52.13]:55820 "EHLO server3.hostpoint.ch") by vger.kernel.org with ESMTP id S261188AbVCTMfd (ORCPT ); Sun, 20 Mar 2005 07:35:33 -0500 Content-Disposition: inline In-Reply-To: <20050220165420.GC14375@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_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 --- linux-2.6.11.orig/drivers/scsi/aacraid/linit.c 2005-03-02 12:50:37.000000000 +0100 +++ linux-2.6.11/drivers/scsi/aacraid/linit.c 2005-03-20 13:27:54.000000000 +0100 @@ -45,6 +45,7 @@ #include #include #include +#include #include #include @@ -545,8 +546,8 @@ static int __devinit aac_probe_one(struc if (pci_enable_device(pdev)) goto out; - if (pci_set_dma_mask(pdev, 0xFFFFFFFFULL) || - pci_set_consistent_dma_mask(pdev, 0xFFFFFFFFULL)) + if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) || + pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) goto out; /* * If the quirk31 bit is set, the adapter needs adapter @@ -589,7 +590,7 @@ static int __devinit aac_probe_one(struc * address space. */ if (aac_drivers[index].quirks & AAC_QUIRK_31BIT) - if (pci_set_dma_mask(pdev, 0xFFFFFFFFULL)) + if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) goto out_free_fibs; aac_get_adapter_info(aac);