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

Commit 56b146d3 authored by Tobias Klauser's avatar Tobias Klauser Committed by Linus Torvalds
Browse files

[PATCH] Last DMA_xBIT_MASK cleanups 



These are the last conversions of pci_set_dma_mask(),
pci_set_consistent_dma_mask() and pci_dma_supported() to use DMA_xBIT_MASK
constants from linux/dma-mapping.h

Signed-off-by: default avatarTobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 31cc48bf

Documentation/DMA-mapping.txt

+2 −2
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ document for how to handle this case. 
Finally, if your device can only drive the low 24-bits of

address during PCI bus mastering you might do something like:



	if (pci_set_dma_mask(pdev, 0x00ffffff)) {

	if (pci_set_dma_mask(pdev, DMA_24BIT_MASK)) {

		printk(KERN_WARNING

		       "mydev: 24-bit DMA addressing not available.\n");

		goto ignore_this_device;

Documentation/sound/alsa/DocBook/writing-an-alsa-driver.tmpl

+8 −8
Original line number Diff line number Diff line
@@ -1123,8 +1123,8 @@ 
          if ((err = pci_enable_device(pci)) < 0)

                  return err;

          /* check PCI availability (28bit DMA) */

          if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||

              pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {

          if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||

              pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {

                  printk(KERN_ERR "error to set 28bit mask DMA\n");

                  pci_disable_device(pci);

                  return -ENXIO;
@@ -1236,8 +1236,8 @@ 
<![CDATA[

  if ((err = pci_enable_device(pci)) < 0)

          return err;

  if (pci_set_dma_mask(pci, 0x0fffffff) < 0 ||

      pci_set_consistent_dma_mask(pci, 0x0fffffff) < 0) {

  if (pci_set_dma_mask(pci, DMA_28BIT_MASK) < 0 ||

      pci_set_consistent_dma_mask(pci, DMA_28BIT_MASK) < 0) {

          printk(KERN_ERR "error to set 28bit mask DMA\n");

          pci_disable_device(pci);

          return -ENXIO;

drivers/media/video/saa7134/saa7134-core.c

+2 −1
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/interrupt.h>

#include <linux/delay.h>

#include <linux/mutex.h>

#include <linux/dma-mapping.h>



#include "saa7134-reg.h"

#include "saa7134.h"
@@ -870,7 +871,7 @@ static int __devinit saa7134_initdev(struct pci_dev *pci_dev, 
	       pci_name(pci_dev), dev->pci_rev, pci_dev->irq,

	       dev->pci_lat,pci_resource_start(pci_dev,0));

	pci_set_master(pci_dev);

	if (!pci_dma_supported(pci_dev,0xffffffff)) {

	if (!pci_dma_supported(pci_dev, DMA_32BIT_MASK)) {

		printk("%s: Oops: no 32bit PCI DMA ???\n",dev->name);

		err = -EIO;

		goto fail1;

drivers/sn/ioc3.c

+3 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/errno.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/interrupt.h>

#include <linux/spinlock.h>

#include <linux/delay.h>
@@ -619,9 +620,9 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id) 
	pci_set_master(pdev);



#ifdef USE_64BIT_DMA

        ret = pci_set_dma_mask(pdev, 0xffffffffffffffffULL);

        ret = pci_set_dma_mask(pdev, DMA_64BIT_MASK);

        if (!ret) {

                ret = pci_set_consistent_dma_mask(pdev, 0xffffffffffffffffULL);

                ret = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK);

                if (ret < 0) {

                        printk(KERN_WARNING "%s: Unable to obtain 64 bit DMA "

                               "for consistent allocations\n",

sound/oss/emu10k1/main.c

+2 −1
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 
#include <linux/init.h>

#include <linux/delay.h>

#include <linux/proc_fs.h>

#include <linux/dma-mapping.h>



#include "hwaccess.h"

#include "8010.h"
@@ -119,7 +120,7 @@ 
 



/* the emu10k1 _seems_ to only supports 29 bit (512MiB) bit bus master */

#define EMU10K1_DMA_MASK                0x1fffffff	/* DMA buffer mask for pci_alloc_consist */

#define EMU10K1_DMA_MASK DMA_29BIT_MASK	/* DMA buffer mask for pci_alloc_consist */



#ifndef PCI_VENDOR_ID_CREATIVE

#define PCI_VENDOR_ID_CREATIVE 0x1102