From f5e9f859ed77eb2396aa836e22c858b16a8b7fe6 Mon Sep 17 00:00:00 2001 From: "mike.miller@hp.com" Date: Fri, 10 Jun 2005 14:51:04 -0500 Subject: [PATCH] --- yaml --- r: 2078 b: refs/heads/master c: eb0df9962d97f7156a0870aced9018bf5c8f54c1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/cciss.c | 12 +++--------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index d1698c482b02..6eeabd2d988e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e431223eca7e0785a5402999b43b16622409017f +refs/heads/master: eb0df9962d97f7156a0870aced9018bf5c8f54c1 diff --git a/trunk/drivers/block/cciss.c b/trunk/drivers/block/cciss.c index 8f7c1a1ed7f4..abde27027c06 100644 --- a/trunk/drivers/block/cciss.c +++ b/trunk/drivers/block/cciss.c @@ -41,6 +41,7 @@ #include #include +#include #include #include #include @@ -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");