diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-06-17 18:42:23 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-06-17 18:42:23 -0500 |
| commit | 3237ee78fc00f786d5f5aec6f9310b0e39069f15 (patch) | |
| tree | 4c94e70ab846ffcb8bb5715fb3c8d8473358a323 /drivers/block/cciss.c | |
| parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
| parent | df0ae2497ddefd72a87f3a3b34ff32455d7d4ae0 (diff) | |
| download | linux-rt-3237ee78fc00f786d5f5aec6f9310b0e39069f15.tar.gz | |
merge by hand (fix up qla_os.c merge error)
Diffstat (limited to 'drivers/block/cciss.c')
| -rw-r--r-- | drivers/block/cciss.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 8f7c1a1ed7f4..abde27027c06 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c @@ -41,6 +41,7 @@ #include <asm/uaccess.h> #include <asm/io.h> +#include <linux/dma-mapping.h> #include <linux/blkdev.h> #include <linux/genhd.h> #include <linux/completion.h> @@ -126,8 +127,6 @@ static struct board_type products[] = { #define MAX_CTLR_ORIG 8 -#define CCISS_DMA_MASK 0xFFFFFFFF /* 32 bit DMA */ - static ctlr_info_t *hba[MAX_CTLR]; static void do_cciss_request(request_queue_t *q); @@ -2393,11 +2392,6 @@ static int cciss_pci_init(ctlr_info_t *c, struct pci_dev *pdev) printk(KERN_ERR "cciss: Unable to Enable PCI device\n"); return( -1); } - if (pci_set_dma_mask(pdev, CCISS_DMA_MASK ) != 0) - { - printk(KERN_ERR "cciss: Unable to set DMA mask\n"); - return(-1); - } subsystem_vendor_id = pdev->subsystem_vendor; subsystem_device_id = pdev->subsystem_device; @@ -2747,9 +2741,9 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, hba[i]->pdev = pdev; /* configure PCI DMA stuff */ - if (!pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) + if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) printk("cciss: using DAC cycles\n"); - else if (!pci_set_dma_mask(pdev, 0xffffffff)) + else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) printk("cciss: not using DAC cycles\n"); else { printk("cciss: no suitable DMA available\n"); |