Commit 051a07ec authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files

net: sgi: ioc3-eth: simplify setting the DMA mask 



There is no need to fall back to a lower mask these days, the DMA mask
just communicates the hardware supported features.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 59511bcf

drivers/net/ethernet/sgi/ioc3-eth.c

+7 −20
Original line number Diff line number Diff line
@@ -1173,27 +1173,15 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct ioc3 *ioc3;

	unsigned long ioc3_base, ioc3_size;

	u32 vendor, model, rev;

	int err, pci_using_dac;

	int err;



	/* Configure DMA attributes. */

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

	if (!err) {

		pci_using_dac = 1;

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

		if (err < 0) {

			pr_err("%s: Unable to obtain 64 bit DMA for consistent allocations\n",

			       pci_name(pdev));

			goto out;

		}

	} else {

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

	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (err) {

		pr_err("%s: No usable DMA configuration, aborting.\n",

		       pci_name(pdev));

		goto out;

	}

		pci_using_dac = 0;

	}



	if (pci_enable_device(pdev))

		return -ENODEV;
@@ -1204,7 +1192,6 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		goto out_disable;

	}



	if (pci_using_dac)

	dev->features |= NETIF_F_HIGHDMA;



	err = pci_request_regions(pdev, "ioc3");