public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 03/19] drivers/scsi/aacraid/linit: Use the DMA_{64,32}BIT_MASK constants
@ 2005-02-20 16:54 Tobias Klauser
  2005-03-20 12:35 ` [UPDATE PATCH 03/19] drivers/scsi/aacraid/linit: Use the DMA_32BIT_MASK constant Tobias Klauser
  0 siblings, 1 reply; 2+ messages in thread
From: Tobias Klauser @ 2005-02-20 16:54 UTC (permalink / raw)
  To: kernel-janitors; +Cc: linux-scsi

Hello,

Description: Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h
when calling pci_set_dma_mask() or pci_set_consistent_dma_mask()
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-rc4.orig/drivers/scsi/aacraid/linit.c	2005-02-13 17:13:06.000000000 +0100
+++ linux-2.6.11-rc4/drivers/scsi/aacraid/linit.c	2005-02-16 21:26:46.000000000 +0100
@@ -545,8 +545,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 +589,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);

^ permalink raw reply	[flat|nested] 2+ messages in thread

* [UPDATE PATCH 03/19] drivers/scsi/aacraid/linit: Use the DMA_32BIT_MASK constant
  2005-02-20 16:54 [PATCH 03/19] drivers/scsi/aacraid/linit: Use the DMA_{64,32}BIT_MASK constants Tobias Klauser
@ 2005-03-20 12:35 ` Tobias Klauser
  0 siblings, 0 replies; 2+ messages in thread
From: Tobias Klauser @ 2005-03-20 12:35 UTC (permalink / raw)
  To: kernel-janitors; +Cc: linux-scsi

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/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 <linux/syscalls.h>
 #include <linux/ioctl32.h>
 #include <linux/delay.h>
+#include <linux/dma-mapping.h>
 #include <asm/semaphore.h>
 
 #include <scsi/scsi.h>
@@ -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);

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2005-03-20 12:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-02-20 16:54 [PATCH 03/19] drivers/scsi/aacraid/linit: Use the DMA_{64,32}BIT_MASK constants Tobias Klauser
2005-03-20 12:35 ` [UPDATE PATCH 03/19] drivers/scsi/aacraid/linit: Use the DMA_32BIT_MASK constant Tobias Klauser

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox