[PATCH] aic7xxx driver warning

[PATCH] aic7xxx driver warning

[Miguel Angel Flores]

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

Hi all,

These are two possible patches for the 2.6.10rc3. The patches correct a 
compiler warning when CONFIG_HIGHMEM64G is not defined.

Both patches works well. "Opt1" is the Alan Cox way and "Opt2" is the 
MaF way :-)

Cheers,
MaF

[-- Attachment #2: aic7xxx.opt1.patch --]
[-- Type: text/x-patch, Size: 566 bytes --]

diff -r -u linux-2.6.10rc3/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c linux-2.6.10rc3-maf/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
--- linux-2.6.10rc3/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c	2004-12-05 20:02:40.000000000 +0100
+++ linux-2.6.10rc3-maf/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c	2004-12-10 21:21:57.000000000 +0100
@@ -226,7 +226,7 @@
 	}
 	pci_set_master(pdev);
 
-	mask_39bit = 0x7FFFFFFFFFULL;
+	mask_39bit = (dma_addr_t)0x7FFFFFFFFFULL;
 	if (sizeof(dma_addr_t) > 4
 	 && ahc_linux_get_memsize() > 0x80000000
 	 && pci_set_dma_mask(pdev, mask_39bit) == 0) {

[-- Attachment #3: aic7xxx.opt2.patch --]
[-- Type: text/x-patch, Size: 668 bytes --]

diff -r -u linux-2.6.10rc3/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c linux-2.6.10rc3-maf/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c
--- linux-2.6.10rc3/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c	2004-12-05 20:02:40.000000000 +0100
+++ linux-2.6.10rc3-maf/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c	2004-12-10 21:31:51.000000000 +0100
@@ -226,10 +226,10 @@
 	}
 	pci_set_master(pdev);
 
-	mask_39bit = 0x7FFFFFFFFFULL;
 	if (sizeof(dma_addr_t) > 4
 	 && ahc_linux_get_memsize() > 0x80000000
 	 && pci_set_dma_mask(pdev, mask_39bit) == 0) {
+		mask_39bit = (dma_addr_t)0x7FFFFFFFFFULL;
 		ahc->flags |= AHC_39BIT_ADDRESSING;
 		ahc->platform_data->hw_dma_mask = mask_39bit;
 	} else {

Re: [PATCH] aic7xxx driver warning

[Dave Jones]

On Fri, Dec 10, 2004 at 11:15:56PM +0100, Miguel Angel Flores wrote:
 > Hi all,
 > 
 > These are two possible patches for the 2.6.10rc3. The patches correct a 
 > compiler warning when CONFIG_HIGHMEM64G is not defined.
 > 
 > Both patches works well. "Opt1" is the Alan Cox way and "Opt2" is the 
 > MaF way :-)

-       mask_39bit = 0x7FFFFFFFFFULL;
        if (sizeof(dma_addr_t) > 4
         && ahc_linux_get_memsize() > 0x80000000
         && pci_set_dma_mask(pdev, mask_39bit) == 0) {
+               mask_39bit = (dma_addr_t)0x7FFFFFFFFFULL;
                ahc->flags |= AHC_39BIT_ADDRESSING;
                ahc->platform_data->hw_dma_mask = mask_39bit;
        } else {

How can this work ? You're using mask_39bit before you set it
(See the pci_set_dma_mask call)

		Dave