Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1238927

[PATCH 05/15] cx88: use pci_set_dma_mask insted of pci_dma_supported

Show all headers | View raw

This ensures the dma mask that is supported by the driver is recorded
in the device structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/media/pci/cx88/cx88-alsa.c  | 2 +-
 drivers/media/pci/cx88/cx88-mpeg.c  | 2 +-
 drivers/media/pci/cx88/cx88-video.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c
index 7f8dc60..0703a81 100644
--- a/drivers/media/pci/cx88/cx88-alsa.c
+++ b/drivers/media/pci/cx88/cx88-alsa.c
@@ -890,7 +890,7 @@ static int snd_cx88_create(struct snd_card *card, struct pci_dev *pci,
 		return err;
 	}
 
-	if (!pci_dma_supported(pci,DMA_BIT_MASK(32))) {
+	if (!pci_set_dma_mask(pci,DMA_BIT_MASK(32))) {
 		dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name);
 		err = -EIO;
 		cx88_core_put(core, pci);
diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c
index 34f5057..9b3b565 100644
--- a/drivers/media/pci/cx88/cx88-mpeg.c
+++ b/drivers/media/pci/cx88/cx88-mpeg.c
@@ -393,7 +393,7 @@ static int cx8802_init_common(struct cx8802_dev *dev)
 	if (pci_enable_device(dev->pci))
 		return -EIO;
 	pci_set_master(dev->pci);
-	if (!pci_dma_supported(dev->pci,DMA_BIT_MASK(32))) {
+	if (!pci_set_dma_mask(dev->pci,DMA_BIT_MASK(32))) {
 		printk("%s/2: Oops: no 32bit PCI DMA ???\n",dev->core->name);
 		return -EIO;
 	}
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index 400e5ca..f12af31 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -1311,7 +1311,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
 	       dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));
 
 	pci_set_master(pci_dev);
-	if (!pci_dma_supported(pci_dev,DMA_BIT_MASK(32))) {
+	if (!pci_set_dma_mask(pci_dev,DMA_BIT_MASK(32))) {
 		printk("%s/0: Oops: no 32bit PCI DMA ???\n",core->name);
 		err = -EIO;
 		goto fail_core;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

remove dma_supported and pci_dma_supported as public APIs Christoph Hellwig <hch@lst.de> - 2015-10-03 17:30 +0200
  [PATCH 09/15] mpsc: use dma_set_mask insted of dma_supported Christoph Hellwig <hch@lst.de> - 2015-10-03 17:30 +0200
  [PATCH 06/15] cx25821: use pci_set_dma_mask insted of pci_dma_supported Christoph Hellwig <hch@lst.de> - 2015-10-03 17:30 +0200
  [PATCH 05/15] cx88: use pci_set_dma_mask insted of pci_dma_supported Christoph Hellwig <hch@lst.de> - 2015-10-03 17:30 +0200
    Re: [PATCH 05/15] cx88: use pci_set_dma_mask insted of  pci_dma_supported Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2015-10-03 19:00 +0200
  [PATCH 13/15] usbnet: remove ifdefed out call to dma_supported Christoph Hellwig <hch@lst.de> - 2015-10-03 17:30 +0200
  [PATCH 08/15] netup_unidvb: use pci_set_dma_mask insted of pci_dma_supported Christoph Hellwig <hch@lst.de> - 2015-10-03 17:30 +0200
  [PATCH 02/15] tw68-core: use pci_set_dma_mask insted of pci_dma_supported Christoph Hellwig <hch@lst.de> - 2015-10-03 17:40 +0200
  [PATCH 01/15] pcnet32: use pci_set_dma_mask insted of pci_dma_supported Christoph Hellwig <hch@lst.de> - 2015-10-03 17:40 +0200

csiph-web