diff options
-rw-r--r-- | drivers/block/cciss.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index 45c4c3131c8f..f7c3c53bd0cd 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c | |||
@@ -3086,11 +3086,8 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, | |||
3086 | int i; | 3086 | int i; |
3087 | int j; | 3087 | int j; |
3088 | int rc; | 3088 | int rc; |
3089 | int dac; | ||
3089 | 3090 | ||
3090 | printk(KERN_DEBUG "cciss: Device 0x%x has been found at" | ||
3091 | " bus %d dev %d func %d\n", | ||
3092 | pdev->device, pdev->bus->number, PCI_SLOT(pdev->devfn), | ||
3093 | PCI_FUNC(pdev->devfn)); | ||
3094 | i = alloc_cciss_hba(); | 3091 | i = alloc_cciss_hba(); |
3095 | if(i < 0) | 3092 | if(i < 0) |
3096 | return (-1); | 3093 | return (-1); |
@@ -3106,11 +3103,11 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, | |||
3106 | 3103 | ||
3107 | /* configure PCI DMA stuff */ | 3104 | /* configure PCI DMA stuff */ |
3108 | if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) | 3105 | if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) |
3109 | printk("cciss: using DAC cycles\n"); | 3106 | dac = 1; |
3110 | else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) | 3107 | else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) |
3111 | printk("cciss: not using DAC cycles\n"); | 3108 | dac = 0; |
3112 | else { | 3109 | else { |
3113 | printk("cciss: no suitable DMA available\n"); | 3110 | printk(KERN_ERR "cciss: no suitable DMA available\n"); |
3114 | goto clean1; | 3111 | goto clean1; |
3115 | } | 3112 | } |
3116 | 3113 | ||
@@ -3141,6 +3138,11 @@ static int __devinit cciss_init_one(struct pci_dev *pdev, | |||
3141 | hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname); | 3138 | hba[i]->intr[SIMPLE_MODE_INT], hba[i]->devname); |
3142 | goto clean2; | 3139 | goto clean2; |
3143 | } | 3140 | } |
3141 | |||
3142 | printk(KERN_INFO "%s: <0x%x> at PCI %s IRQ %d%s using DAC\n", | ||
3143 | hba[i]->devname, pdev->device, pci_name(pdev), | ||
3144 | hba[i]->intr[SIMPLE_MODE_INT], dac ? "" : " not"); | ||
3145 | |||
3144 | hba[i]->cmd_pool_bits = kmalloc(((NR_CMDS+BITS_PER_LONG-1)/BITS_PER_LONG)*sizeof(unsigned long), GFP_KERNEL); | 3146 | hba[i]->cmd_pool_bits = kmalloc(((NR_CMDS+BITS_PER_LONG-1)/BITS_PER_LONG)*sizeof(unsigned long), GFP_KERNEL); |
3145 | hba[i]->cmd_pool = (CommandList_struct *)pci_alloc_consistent( | 3147 | hba[i]->cmd_pool = (CommandList_struct *)pci_alloc_consistent( |
3146 | hba[i]->pdev, NR_CMDS * sizeof(CommandList_struct), | 3148 | hba[i]->pdev, NR_CMDS * sizeof(CommandList_struct), |