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

Commit 93aea718 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Garzik
Browse files

[PATCH] skge: dma configuration cleanup 



Cleanup of the part of the code that sets up DMA configuration.
Should cause no real change in operation, just clearer.

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent c3da1447

drivers/net/skge.c

+10 −14
Original line number Diff line number Diff line
@@ -3251,23 +3251,19 @@ static int __devinit skge_probe(struct pci_dev *pdev, 


	pci_set_master(pdev);



	if (sizeof(dma_addr_t) > sizeof(u32) &&

	    !(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK))) {

	if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {

		using_dac = 1;

		err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);

		if (err < 0) {

			printk(KERN_ERR PFX "%s unable to obtain 64 bit DMA "

			       "for consistent allocations\n", pci_name(pdev));

			goto err_out_free_regions;

	} else if (!(err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) {

		using_dac = 0;

		err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);

	}

	} else {

		err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);



	if (err) {

		printk(KERN_ERR PFX "%s no usable DMA configuration\n",

		       pci_name(pdev));

		goto err_out_free_regions;

	}

	}



#ifdef __BIG_ENDIAN

	/* byte swap descriptors in hardware */