Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e3f47cc7 authored by Abhijeet Joglekar's avatar Abhijeet Joglekar Committed by James Bottomley
Browse files

[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: default avatarAbhijeet Joglekar <abjoglek@cisco.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 87a2d34b

drivers/scsi/fnic/fnic_main.c

+4 −4
Original line number Diff line number Diff line
@@ -473,16 +473,16 @@ static int __devinit fnic_probe(struct pci_dev *pdev, 
	 * limitation for the device.  Try 40-bit first, and

	 * 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) {

		err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);

		err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));

		if (err) {

			shost_printk(KERN_ERR, fnic->lport->host,

				     "No usable DMA configuration "

				     "aborting\n");

			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) {

			shost_printk(KERN_ERR, fnic->lport->host,

				     "Unable to obtain 32-bit DMA "
@@ -490,7 +490,7 @@ static int __devinit fnic_probe(struct pci_dev *pdev, 
			goto err_out_release_regions;

		}

	} else {

		err = pci_set_consistent_dma_mask(pdev, DMA_40BIT_MASK);

		err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(40));

		if (err) {

			shost_printk(KERN_ERR, fnic->lport->host,

				     "Unable to obtain 40-bit DMA "