Skip to contentSkip to conversation

drivers/message/fusion/mptbase.c: Use the

PATCH Tobias Klauser 1 participant 1 message Mar 8, 2005

Subsystems (2)
lore
Share & tools
lore
#0 lore raw
Quoted 8 lines · Matthew Wilcox

On Tue, Mar 08, 2005 at 03:45:58PM +0100, Tobias Klauser wrote:

You missed this line:

        u64              mask = 0xffffffffffffffffULL;

In fact, looks to me like you can remove the variable and just use the DMA_64BIT_MASK constant.

Thanks for noticing. Here's an updated patch:

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

drivers/message/fusion/mptbase.c +3 -4
@@ -1084,7 +1084,6 @@ mptbase_probe(struct pci_dev *pdev, cons
 	u32		 psize;
 	int		 ii;
 	int		 r = -ENODEV;
-	u64		 mask = 0xffffffffffffffffULL;
 	u8		 revision;
 	u8		 pcixcmd;
 	static int	 mpt_ids = 0;
@@ -1097,15 +1096,15 @@ mptbase_probe(struct pci_dev *pdev, cons
 	
 	dinitprintk((KERN_WARNING MYNAM ": mpt_adapter_install\n"));
 	
-	if (!pci_set_dma_mask(pdev, mask)) {
+	if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
 		dprintk((KERN_INFO MYNAM
 			": 64 BIT PCI BUS DMA ADDRESSING SUPPORTED\n"));
-	} else if (pci_set_dma_mask(pdev, (u64) 0xffffffff)) {
+	} else if (pci_set_dma_mask(pdev, DMA_32BIT_MASK)) {
 		printk(KERN_WARNING MYNAM ": 32 BIT PCI BUS DMA ADDRESSING NOT SUPPORTED\n");
 		return r;
 	}
 
-	if (!pci_set_consistent_dma_mask(pdev, mask))
+	if (!pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))
 		dprintk((KERN_INFO MYNAM
 			": Using 64 bit consistent mask\n"));
 	else

_______________________________________________
Kernel-janitors mailing list
[email protected]
http://lists.osdl.org/mailman/listinfo/kernel-janitors