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

Commit c5a37883 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge final patch-bomb from Andrew Morton:
 "Various leftovers, mainly Christoph's pci_dma_supported() removals"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  pci: remove pci_dma_supported
  usbnet: remove ifdefed out call to dma_supported
  kaweth: remove ifdefed out call to dma_supported
  sfc: don't call dma_supported
  nouveau: don't call pci_dma_supported
  netup_unidvb: use pci_set_dma_mask insted of pci_dma_supported
  cx23885: use pci_set_dma_mask insted of pci_dma_supported
  cx25821: use pci_set_dma_mask insted of pci_dma_supported
  cx88: use pci_set_dma_mask insted of pci_dma_supported
  saa7134: use pci_set_dma_mask insted of pci_dma_supported
  saa7164: use pci_set_dma_mask insted of pci_dma_supported
  tw68-core: use pci_set_dma_mask insted of pci_dma_supported
  pcnet32: use pci_set_dma_mask insted of pci_dma_supported
  lib/string.c: add ULL suffix to the constant definition
  hugetlb: trivial comment fix
  selftests/mlock2: add ULL suffix to 64-bit constants
  selftests/mlock2: add missing #define _GNU_SOURCE
parents 5dfe5b2c 247e75db

drivers/gpu/drm/nouveau/nouveau_ttm.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -353,8 +353,7 @@ nouveau_ttm_init(struct nouveau_drm *drm) 




	bits = nvxx_mmu(&drm->device)->dma_bits;

	bits = nvxx_mmu(&drm->device)->dma_bits;

	if (nvxx_device(&drm->device)->func->pci) {

	if (nvxx_device(&drm->device)->func->pci) {

		if (drm->agp.bridge ||

		if (drm->agp.bridge)

		     !dma_supported(dev->dev, DMA_BIT_MASK(bits)))

			bits = 32;

			bits = 32;

	} else if (device->func->tegra) {

	} else if (device->func->tegra) {

		struct nvkm_device_tegra *tegra = device->func->tegra(device);

		struct nvkm_device_tegra *tegra = device->func->tegra(device);
@@ -369,6 +368,10 @@ nouveau_ttm_init(struct nouveau_drm *drm) 
	}

	}





	ret = dma_set_mask(dev->dev, DMA_BIT_MASK(bits));

	ret = dma_set_mask(dev->dev, DMA_BIT_MASK(bits));

	if (ret && bits != 32) {

		bits = 32;

		ret = dma_set_mask(dev->dev, DMA_BIT_MASK(bits));

	}

	if (ret)

	if (ret)

		return ret;

		return ret;

drivers/media/pci/cx23885/cx23885-core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1992,7 +1992,7 @@ static int cx23885_initdev(struct pci_dev *pci_dev, 
		(unsigned long long)pci_resource_start(pci_dev, 0));

		(unsigned long long)pci_resource_start(pci_dev, 0));





	pci_set_master(pci_dev);

	pci_set_master(pci_dev);

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

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

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

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

		err = -EIO;

		err = -EIO;

		goto fail_context;

		goto fail_context;

drivers/media/pci/cx25821/cx25821-core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1319,7 +1319,7 @@ static int cx25821_initdev(struct pci_dev *pci_dev, 
		dev->pci_lat, (unsigned long long)dev->base_io_addr);

		dev->pci_lat, (unsigned long long)dev->base_io_addr);





	pci_set_master(pci_dev);

	pci_set_master(pci_dev);

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

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

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

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

		err = -EIO;

		err = -EIO;

		goto fail_irq;

		goto fail_irq;

drivers/media/pci/cx88/cx88-alsa.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -890,7 +890,7 @@ static int snd_cx88_create(struct snd_card *card, struct pci_dev *pci, 
		return err;

		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);

		dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name);

		err = -EIO;

		err = -EIO;

		cx88_core_put(core, pci);

		cx88_core_put(core, pci);

drivers/media/pci/cx88/cx88-mpeg.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -393,7 +393,7 @@ static int cx8802_init_common(struct cx8802_dev *dev) 
	if (pci_enable_device(dev->pci))

	if (pci_enable_device(dev->pci))

		return -EIO;

		return -EIO;

	pci_set_master(dev->pci);

	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);

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

		return -EIO;

		return -EIO;

	}

	}