diff options
author | Matthias Gehre <M.Gehre@gmx.de> | 2006-03-28 04:56:48 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-28 12:16:07 -0500 |
commit | 910638ae7ed4be27d6af55f6c9b5bf54b838e78b (patch) | |
tree | 5eda3cfd0e312c8b0916f6d5eb1cd98225e67891 /drivers/scsi/ips.c | |
parent | 60c904ae5bded8bb71f7bff7d63f2a6959d2a8e4 (diff) |
[PATCH] Replace 0xff.. with correct DMA_xBIT_MASK
Replace all occurences of 0xff.. in calls to function pci_set_dma_mask()
and pci_set_consistant_dma_mask() with the corresponding DMA_xBIT_MASK from
linux/dma-mapping.h.
Signed-off-by: Matthias Gehre <M.Gehre@gmx.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/scsi/ips.c')
-rw-r--r-- | drivers/scsi/ips.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 481708d527a..a4c0b04cfdb 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c | |||
@@ -179,6 +179,7 @@ | |||
179 | 179 | ||
180 | #include <linux/blkdev.h> | 180 | #include <linux/blkdev.h> |
181 | #include <linux/types.h> | 181 | #include <linux/types.h> |
182 | #include <linux/dma-mapping.h> | ||
182 | 183 | ||
183 | #include <scsi/sg.h> | 184 | #include <scsi/sg.h> |
184 | 185 | ||
@@ -7284,10 +7285,10 @@ ips_init_phase1(struct pci_dev *pci_dev, int *indexPtr) | |||
7284 | * are guaranteed to be < 4G. | 7285 | * are guaranteed to be < 4G. |
7285 | */ | 7286 | */ |
7286 | if (IPS_ENABLE_DMA64 && IPS_HAS_ENH_SGLIST(ha) && | 7287 | if (IPS_ENABLE_DMA64 && IPS_HAS_ENH_SGLIST(ha) && |
7287 | !pci_set_dma_mask(ha->pcidev, 0xffffffffffffffffULL)) { | 7288 | !pci_set_dma_mask(ha->pcidev, DMA_64BIT_MASK)) { |
7288 | (ha)->flags |= IPS_HA_ENH_SG; | 7289 | (ha)->flags |= IPS_HA_ENH_SG; |
7289 | } else { | 7290 | } else { |
7290 | if (pci_set_dma_mask(ha->pcidev, 0xffffffffULL) != 0) { | 7291 | if (pci_set_dma_mask(ha->pcidev, DMA_32BIT_MASK) != 0) { |
7291 | printk(KERN_WARNING "Unable to set DMA Mask\n"); | 7292 | printk(KERN_WARNING "Unable to set DMA Mask\n"); |
7292 | return ips_abort_init(ha, index); | 7293 | return ips_abort_init(ha, index); |
7293 | } | 7294 | } |