Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[SCSI] fnic: use DMA_BIT_MASK(nn) instead of deprecated DMA_nnBIT_MASK

Robert Love reported warning while building fnic_main.c:
drivers/scsi/fnic/fnic_main.c:478: warning: `DMA_nnBIT_MASK' is deprecated.

Replaced use of DMA_nnBIT_MASK by DMA_BIT_MASK(nn)

Signed-off-by: Abhijeet Joglekar <abjoglek@cisco.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

authored by

Abhijeet Joglekar and committed by
James Bottomley
e3f47cc7 87a2d34b

+4 -4
+4 -4
drivers/scsi/fnic/fnic_main.c
··· 473 473 * limitation for the device. Try 40-bit first, and 474 474 * fail to 32-bit. 475 475 */ 476 - err = pci_set_dma_mask(pdev, DMA_40BIT_MASK); 476 + err = pci_set_dma_mask(pdev, DMA_BIT_MASK(40)); 477 477 if (err) { 478 - err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 478 + err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); 479 479 if (err) { 480 480 shost_printk(KERN_ERR, fnic->lport->host, 481 481 "No usable DMA configuration " 482 482 "aborting\n"); 483 483 goto err_out_release_regions; 484 484 } 485 - err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK); 485 + err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); 486 486 if (err) { 487 487 shost_printk(KERN_ERR, fnic->lport->host, 488 488 "Unable to obtain 32-bit DMA " ··· 490 490 goto err_out_release_regions; 491 491 } 492 492 } else { 493 - err = pci_set_consistent_dma_mask(pdev, DMA_40BIT_MASK); 493 + err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(40)); 494 494 if (err) { 495 495 shost_printk(KERN_ERR, fnic->lport->host, 496 496 "Unable to obtain 40-bit DMA "