|
@@ -473,16 +473,16 @@ static int __devinit fnic_probe(struct pci_dev *pdev,
|
|
* limitation for the device. Try 40-bit first, and
|
|
* limitation for the device. Try 40-bit first, and
|
|
* fail to 32-bit.
|
|
* fail to 32-bit.
|
|
*/
|
|
*/
|
|
- err = pci_set_dma_mask(pdev, DMA_40BIT_MASK);
|
|
|
|
|
|
+ err = pci_set_dma_mask(pdev, DMA_BIT_MASK(40));
|
|
if (err) {
|
|
if (err) {
|
|
- err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
|
|
|
|
|
|
+ err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
|
|
if (err) {
|
|
if (err) {
|
|
shost_printk(KERN_ERR, fnic->lport->host,
|
|
shost_printk(KERN_ERR, fnic->lport->host,
|
|
"No usable DMA configuration "
|
|
"No usable DMA configuration "
|
|
"aborting\n");
|
|
"aborting\n");
|
|
goto err_out_release_regions;
|
|
goto err_out_release_regions;
|
|
}
|
|
}
|
|
- err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
|
|
|
|
|
|
+ err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
|
|
if (err) {
|
|
if (err) {
|
|
shost_printk(KERN_ERR, fnic->lport->host,
|
|
shost_printk(KERN_ERR, fnic->lport->host,
|
|
"Unable to obtain 32-bit DMA "
|
|
"Unable to obtain 32-bit DMA "
|
|
@@ -490,7 +490,7 @@ static int __devinit fnic_probe(struct pci_dev *pdev,
|
|
goto err_out_release_regions;
|
|
goto err_out_release_regions;
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
- err = pci_set_consistent_dma_mask(pdev, DMA_40BIT_MASK);
|
|
|
|
|
|
+ err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(40));
|
|
if (err) {
|
|
if (err) {
|
|
shost_printk(KERN_ERR, fnic->lport->host,
|
|
shost_printk(KERN_ERR, fnic->lport->host,
|
|
"Unable to obtain 40-bit DMA "
|
|
"Unable to obtain 40-bit DMA "
|