Skip to content

Commit

Permalink
[PATCH] drivers/net/8139cp: Use the DMA_{64, 32}BIT_MASK constants
Browse files Browse the repository at this point in the history
  
  The previous patch did not compile cleanly on all architectures so
  here's a fixed one.
  
  Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling
  pci_set_dma_mask() or pci_set_consistent_dma_mask()
  
  Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
  Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
  • Loading branch information
Tobias Klauser authored and Jeff Garzik committed May 13, 2005
1 parent 88d7bd8 commit 8662d06
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions drivers/net/8139cp.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
#include <linux/etherdevice.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/dma-mapping.h>
#include <linux/delay.h>
#include <linux/ethtool.h>
#include <linux/mii.h>
Expand Down Expand Up @@ -1701,19 +1702,19 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)

/* Configure DMA attributes. */
if ((sizeof(dma_addr_t) > 4) &&
!pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL) &&
!pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) {
!pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK) &&
!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) {
pci_using_dac = 1;
} else {
pci_using_dac = 0;

rc = pci_set_dma_mask(pdev, 0xffffffffULL);
rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (rc) {
printk(KERN_ERR PFX "No usable DMA configuration, "
"aborting.\n");
goto err_out_res;
}
rc = pci_set_consistent_dma_mask(pdev, 0xffffffffULL);
rc = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK);
if (rc) {
printk(KERN_ERR PFX "No usable consistent DMA configuration, "
"aborting.\n");
Expand Down

0 comments on commit 8662d06

Please sign in to comment.