From 6a35528a8346f6e6fd32ed7e51f04d1fa4ca2c01 Mon Sep 17 00:00:00 2001 From: Yang Hongyang Date: Mon, 6 Apr 2009 19:01:13 -0700 Subject: dma-mapping: replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64) Replace all DMA_64BIT_MASK macro with DMA_BIT_MASK(64) Signed-off-by: Yang Hongyang Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/staging/altpciechdma/altpciechdma.c | 4 ++-- drivers/staging/slicoss/slicoss.c | 4 ++-- drivers/staging/sxg/sxg.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'drivers/staging') diff --git a/drivers/staging/altpciechdma/altpciechdma.c b/drivers/staging/altpciechdma/altpciechdma.c index 3e41e086148..6a4d0b8e096 100644 --- a/drivers/staging/altpciechdma/altpciechdma.c +++ b/drivers/staging/altpciechdma/altpciechdma.c @@ -849,8 +849,8 @@ static int __devinit probe(struct pci_dev *dev, const struct pci_device_id *id) #if 1 /* @todo For now, disable 64-bit, because I do not understand the implications (DAC!) */ /* query for DMA transfer */ /* @see Documentation/PCI/PCI-DMA-mapping.txt */ - if (!pci_set_dma_mask(dev, DMA_64BIT_MASK)) { - pci_set_consistent_dma_mask(dev, DMA_64BIT_MASK); + if (!pci_set_dma_mask(dev, DMA_BIT_MASK(64))) { + pci_set_consistent_dma_mask(dev, DMA_BIT_MASK(64)); /* use 64-bit DMA */ printk(KERN_DEBUG "Using a 64-bit DMA mask.\n"); } else diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c index 953684f729d..94815634847 100644 --- a/drivers/staging/slicoss/slicoss.c +++ b/drivers/staging/slicoss/slicoss.c @@ -371,9 +371,9 @@ static int __devinit slic_entry_probe(struct pci_dev *pcidev, printk(KERN_DEBUG "%s\n", slic_proc_version); } - err = pci_set_dma_mask(pcidev, DMA_64BIT_MASK); + err = pci_set_dma_mask(pcidev, DMA_BIT_MASK(64)); if (err) { - err = pci_set_dma_mask(pcidev, DMA_32BIT_MASK); + err = pci_set_dma_mask(pcidev, DMA_BIT_MASK(32)); if (err) goto err_out_disable_pci; } diff --git a/drivers/staging/sxg/sxg.c b/drivers/staging/sxg/sxg.c index 0050a022010..a77e1eee569 100644 --- a/drivers/staging/sxg/sxg.c +++ b/drivers/staging/sxg/sxg.c @@ -934,8 +934,8 @@ static int sxg_entry_probe(struct pci_dev *pcidev, pci_read_config_byte(pcidev, PCI_REVISION_ID, &revision_id); - if (!(err = pci_set_dma_mask(pcidev, DMA_64BIT_MASK))) { - DBG_ERROR("pci_set_dma_mask(DMA_64BIT_MASK) successful\n"); + if (!(err = pci_set_dma_mask(pcidev, DMA_BIT_MASK(64)))) { + DBG_ERROR("pci_set_dma_mask(DMA_BIT_MASK(64)) successful\n"); } else { if ((err = pci_set_dma_mask(pcidev, DMA_32BIT_MASK))) { DBG_ERROR -- cgit v1.2.3