The patch titled dma-mapping: replace all DMA_28BIT_MASK macro with DMA_BIT_MASK(28) has been added to the -mm tree. Its filename is replace-all-dma_28bit_mask-macro-with-dma_bit_mask28.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: dma-mapping: replace all DMA_28BIT_MASK macro with DMA_BIT_MASK(28) From: Yang Hongyang <yanghy@xxxxxxxxxxxxxx> Replace all DMA_28BIT_MASK macro with DMA_BIT_MASK(28) Signed-off-by: Yang Hongyang<yanghy@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/net/wan/wanxl.c | 4 ++-- sound/pci/als300.c | 4 ++-- sound/pci/emu10k1/emu10k1x.c | 4 ++-- sound/pci/es1968.c | 4 ++-- sound/pci/ice1712/ice1712.c | 4 ++-- sound/pci/maestro3.c | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff -puN drivers/net/wan/wanxl.c~replace-all-dma_28bit_mask-macro-with-dma_bit_mask28 drivers/net/wan/wanxl.c --- a/drivers/net/wan/wanxl.c~replace-all-dma_28bit_mask-macro-with-dma_bit_mask28 +++ a/drivers/net/wan/wanxl.c @@ -586,8 +586,8 @@ static int __devinit wanxl_pci_init_one( We set both dma_mask and consistent_dma_mask to 28 bits and pray pci_alloc_consistent() will use this info. It should work on most platforms */ - if (pci_set_consistent_dma_mask(pdev, DMA_28BIT_MASK) || - pci_set_dma_mask(pdev, DMA_28BIT_MASK)) { + if (pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(28)) || + pci_set_dma_mask(pdev, DMA_BIT_MASK(28))) { printk(KERN_ERR "wanXL: No usable DMA configuration\n"); return -EIO; } diff -puN sound/pci/als300.c~replace-all-dma_28bit_mask-macro-with-dma_bit_mask28 sound/pci/als300.c --- a/sound/pci/als300.c~replace-all-dma_28bit_mask-macro-with-dma_bit_mask28 +++ a/sound/pci/als300.c @@ -689,8 +689,8 @@ static int __devinit snd_als300_create(s if ((err = pci_enable_device(pci)) < 0) return err; - if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 || - pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) { + if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 || + pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) { printk(KERN_ERR "error setting 28bit DMA mask\n"); pci_disable_device(pci); return -ENXIO; diff -puN sound/pci/emu10k1/emu10k1x.c~replace-all-dma_28bit_mask-macro-with-dma_bit_mask28 sound/pci/emu10k1/emu10k1x.c --- a/sound/pci/emu10k1/emu10k1x.c~replace-all-dma_28bit_mask-macro-with-dma_bit_mask28 +++ a/sound/pci/emu10k1/emu10k1x.c @@ -897,8 +897,8 @@ static int __devinit snd_emu10k1x_create if ((err = pci_enable_device(pci)) < 0) return err; - if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 || - pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) { + if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 || + pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) { snd_printk(KERN_ERR "error to set 28bit mask DMA\n"); pci_disable_device(pci); return -ENXIO; diff -puN sound/pci/es1968.c~replace-all-dma_28bit_mask-macro-with-dma_bit_mask28 sound/pci/es1968.c --- a/sound/pci/es1968.c~replace-all-dma_28bit_mask-macro-with-dma_bit_mask28 +++ a/sound/pci/es1968.c @@ -2539,8 +2539,8 @@ static int __devinit snd_es1968_create(s if ((err = pci_enable_device(pci)) < 0) return err; /* check, if we can restrict PCI DMA transfers to 28 bits */ - if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 || - pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) { + if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 || + pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) { snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); pci_disable_device(pci); return -ENXIO; diff -puN sound/pci/ice1712/ice1712.c~replace-all-dma_28bit_mask-macro-with-dma_bit_mask28 sound/pci/ice1712/ice1712.c --- a/sound/pci/ice1712/ice1712.c~replace-all-dma_28bit_mask-macro-with-dma_bit_mask28 +++ a/sound/pci/ice1712/ice1712.c @@ -2533,8 +2533,8 @@ static int __devinit snd_ice1712_create( if (err < 0) return err; /* check, if we can restrict PCI DMA transfers to 28 bits */ - if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 || - pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) { + if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 || + pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) { snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); pci_disable_device(pci); return -ENXIO; diff -puN sound/pci/maestro3.c~replace-all-dma_28bit_mask-macro-with-dma_bit_mask28 sound/pci/maestro3.c --- a/sound/pci/maestro3.c~replace-all-dma_28bit_mask-macro-with-dma_bit_mask28 +++ a/sound/pci/maestro3.c @@ -2530,8 +2530,8 @@ snd_m3_create(struct snd_card *card, str return -EIO; /* check, if we can restrict PCI DMA transfers to 28 bits */ - if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 || - pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) { + if (pci_set_dma_mask(pci, DMA_BIT_MASK(28)) < 0 || + pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(28)) < 0) { snd_printk(KERN_ERR "architecture does not support 28bit PCI busmaster DMA\n"); pci_disable_device(pci); return -ENXIO; _ Patches currently in -mm which might be from yanghy@xxxxxxxxxxxxxx are replace-all-dma_64bit_mask-macro-with-dma_bit_mask64.patch replace-all-dma_48bit_mask-macro-with-dma_bit_mask48.patch replace-all-dma_40bit_mask-macro-with-dma_bit_mask40.patch replace-all-dma_39bit_mask-macro-with-dma_bit_mask39.patch replace-all-dma_35bit_mask-macro-with-dma_bit_mask35.patch replace-all-dma_32bit_mask-macro-with-dma_bit_mask32.patch replace-all-dma_31bit_mask-macro-with-dma_bit_mask31.patch replace-all-dma_30bit_mask-macro-with-dma_bit_mask30.patch replace-all-dma_28bit_mask-macro-with-dma_bit_mask28.patch replace-all-dma_24bit_mask-macro-with-dma_bit_mask24.patch update-the-old-macro-dma_nbit_mask-related-documentations.patch update-related-documentations.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html