[PATCHv2 04/11]Replace all DMA_39BIT_MASK macro with DMA_BIT_MASK(39)
From: Yang Hongyang <hidden>
Date: 2009-02-19 09:41:16
Also in:
lkml
Subsystem:
aic7xxx / aic79xx scsi driver, networking drivers, scsi subsystem, the rest · Maintainers:
Hannes Reinecke, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, "James E.J. Bottomley", "Martin K. Petersen", Linus Torvalds
Replace all DMA_39BIT_MASK macro with DMA_BIT_MASK(39) Signed-off-by: Yang Hongyang<redacted> --- drivers/net/forcedeth.c | 4 ++-- drivers/net/netxen/netxen_nic_main.c | 8 ++++---- drivers/scsi/aic7xxx/aic79xx_osm_pci.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index 5b910cf..069d87d 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c@@ -5534,12 +5534,12 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i np->desc_ver = DESC_VER_3; np->txrxctl_bits = NVREG_TXRXCTL_DESC_3; if (dma_64bit) { - if (pci_set_dma_mask(pci_dev, DMA_39BIT_MASK)) + if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(39))) dev_printk(KERN_INFO, &pci_dev->dev, "64-bit DMA failed, using 32-bit addressing\n"); else dev->features |= NETIF_F_HIGHDMA; - if (pci_set_consistent_dma_mask(pci_dev, DMA_39BIT_MASK)) { + if (pci_set_consistent_dma_mask(pci_dev, DMA_BIT_MASK(39))) { dev_printk(KERN_INFO, &pci_dev->dev, "64-bit DMA (consistent) failed, using 32-bit ring buffers\n"); }
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 285e725..8bea4cb 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c@@ -177,11 +177,11 @@ static int nx_set_dma_mask(struct netxen_adapter *adapter, uint8_t revision_id) #else if (revision_id >= NX_P3_B0) { /* should go to DMA_BIT_MASK(64) */ - adapter->dma_mask = DMA_39BIT_MASK; - mask = DMA_39BIT_MASK; + adapter->dma_mask = DMA_BIT_MASK(39); + mask = DMA_BIT_MASK(39); } else if (revision_id == NX_P3_A2) { - adapter->dma_mask = DMA_39BIT_MASK; - mask = DMA_39BIT_MASK; + adapter->dma_mask = DMA_BIT_MASK(39); + mask = DMA_BIT_MASK(39); } else if (revision_id == NX_P2_C1) { adapter->dma_mask = DMA_35BIT_MASK; mask = DMA_35BIT_MASK;
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
index 032e2b1..c583d89 100644
--- a/drivers/scsi/aic7xxx/aic79xx_osm_pci.c
+++ b/drivers/scsi/aic7xxx/aic79xx_osm_pci.c@@ -194,11 +194,11 @@ ahd_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (sizeof(dma_addr_t) > 4) { const u64 required_mask = dma_get_required_mask(dev); - if (required_mask > DMA_39BIT_MASK && + if (required_mask > DMA_BIT_MASK(39) && dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) ahd->flags |= AHD_64BIT_ADDRESSING; else if (required_mask > DMA_32BIT_MASK && - dma_set_mask(dev, DMA_39BIT_MASK) == 0) + dma_set_mask(dev, DMA_BIT_MASK(39)) == 0) ahd->flags |= AHD_39BIT_ADDRESSING; else dma_set_mask(dev, DMA_32BIT_MASK);
--
1.6.0.3
--
Regards
Yang Hongyang