All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jan Kiszka <jan.kiszka@siemens.com>
To: xenomai@xenomai.org
Subject: [PATCH 06/15] drivers: Convert pci_set_*dma_mask to DMA API
Date: Mon,  4 Jul 2022 15:08:26 +0200	[thread overview]
Message-ID: <4808964f18dc64761da8dc5c9e6f3345df8f76ea.1656940114.git.jan.kiszka@siemens.com> (raw)
In-Reply-To: <cover.1656940114.git.jan.kiszka@siemens.com>

From: Jan Kiszka <jan.kiszka@siemens.com>

The legacy API has been finally dropped, and the new one was "already"
available with 5.10.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kernel/drivers/net/drivers/e1000/e1000_main.c             | 8 ++++----
 .../drivers/net/drivers/experimental/e1000/e1000_main.c   | 8 ++++----
 .../drivers/net/drivers/experimental/rt2500/rt2500pci.c   | 4 ++--
 kernel/drivers/net/drivers/via-rhine.c                    | 2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/kernel/drivers/net/drivers/e1000/e1000_main.c b/kernel/drivers/net/drivers/e1000/e1000_main.c
index 222709a48f..e2141313d9 100644
--- a/kernel/drivers/net/drivers/e1000/e1000_main.c
+++ b/kernel/drivers/net/drivers/e1000/e1000_main.c
@@ -705,10 +705,10 @@ static int e1000_probe(struct pci_dev *pdev,
 	if ((err = pci_enable_device(pdev)))
 		return err;
 
-	if ((err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64))) ||
-	    (err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64)))) {
-		if ((err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32))) &&
-		    (err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)))) {
+	if ((err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64))) ||
+	    (err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64)))) {
+		if ((err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) &&
+		    (err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)))) {
 			E1000_ERR("No usable DMA configuration, aborting\n");
 			return err;
 		}
diff --git a/kernel/drivers/net/drivers/experimental/e1000/e1000_main.c b/kernel/drivers/net/drivers/experimental/e1000/e1000_main.c
index db16cff11a..50493cff72 100644
--- a/kernel/drivers/net/drivers/experimental/e1000/e1000_main.c
+++ b/kernel/drivers/net/drivers/experimental/e1000/e1000_main.c
@@ -1061,12 +1061,12 @@ static int e1000_probe(struct pci_dev *pdev,
 	if ((err = pci_enable_device(pdev)))
 		return err;
 
-	if (!(err = pci_set_dma_mask(pdev, DMA_64BIT_MASK)) &&
-	    !(err = pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))) {
+	if (!(err = dma_set_mask(&pdev->dev, DMA_64BIT_MASK)) &&
+	    !(err = dma_set_coherent_mask(&pdev->dev, DMA_64BIT_MASK))) {
 		pci_using_dac = 1;
 	} else {
-		if ((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK)) &&
-		    (err = pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))) {
+		if ((err = dma_set_mask(&pdev->dev, DMA_32BIT_MASK)) &&
+		    (err = dma_set_coherent_mask(&pdev->dev, DMA_32BIT_MASK))) {
 			E1000_ERR("No usable DMA configuration, aborting\n");
 			goto err_dma;
 		}
diff --git a/kernel/drivers/net/drivers/experimental/rt2500/rt2500pci.c b/kernel/drivers/net/drivers/experimental/rt2500/rt2500pci.c
index f6f9a2597f..9bbdce7fde 100644
--- a/kernel/drivers/net/drivers/experimental/rt2500/rt2500pci.c
+++ b/kernel/drivers/net/drivers/experimental/rt2500/rt2500pci.c
@@ -1184,8 +1184,8 @@ int rt2x00_pci_probe(struct pci_dev *pci_dev, const struct pci_device_id *id)
 
 	pci_set_master(pci_dev);
 
-	if (pci_set_dma_mask(pci_dev, DMA_BIT_MASK(64)) &&
-	    pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32))) {
+	if (dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(64)) &&
+	    dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32))) {
 		ERROR("PCI DMA not supported\n");
 		status = -EIO;
 		goto exit_disable_device;
diff --git a/kernel/drivers/net/drivers/via-rhine.c b/kernel/drivers/net/drivers/via-rhine.c
index 9618d23e37..122e41d302 100644
--- a/kernel/drivers/net/drivers/via-rhine.c
+++ b/kernel/drivers/net/drivers/via-rhine.c
@@ -662,7 +662,7 @@ static int via_rhine_init_one (struct pci_dev *pdev,
 		goto err_out;
 
 	/* this should always be supported */
-	if (pci_set_dma_mask(pdev, 0xffffffff)) {
+	if (dma_set_mask(&pdev->dev, DMA_BIT_MASK(32))) {
 		printk(KERN_ERR "32-bit PCI DMA addresses not supported by the card!?\n");
 		goto err_out;
 	}
-- 
2.35.3


  parent reply	other threads:[~2022-07-04 13:08 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-07-04 13:08 [PATCH 00/15] Kernel 5.19 adjustments Jan Kiszka
2022-07-04 13:08 ` [PATCH 01/15] Account for switch to pde_data in 5.17 Jan Kiszka
2022-07-04 13:08 ` [PATCH 02/15] Use linux/stddef.h instead of toolchain header Jan Kiszka
2022-07-04 13:08 ` [PATCH 03/15] drivers/switchtest: Remove unused local vars Jan Kiszka
2022-07-04 13:08 ` [PATCH 04/15] drivers/serial/16550A: Account for privatized defines in 5.17 Jan Kiszka
2022-07-04 13:08 ` [PATCH 05/15] drivers/net: Switch to dev_addr_set Jan Kiszka
2022-07-04 13:57   ` Bezdeka, Florian
2022-07-05  9:35     ` Jan Kiszka
2022-07-04 14:32   ` Bezdeka, Florian
2022-07-05  9:41     ` Jan Kiszka
2022-07-05 11:16       ` Bezdeka, Florian
2022-07-05 13:11         ` Jan Kiszka
2022-07-06  9:56   ` [PATCH v2 05/15] drivers/net: Switch to dev_addr_set and eth_hw_addr_set Jan Kiszka
2022-07-04 13:08 ` Jan Kiszka [this message]
2022-07-04 13:08 ` [PATCH 07/15] drivers: Convert pci_alloc/free_consistent to DMA API Jan Kiszka
2022-07-04 13:08 ` [PATCH 08/15] drivers: Convert pci_map/unmap_single/page " Jan Kiszka
2022-07-04 13:08 ` [PATCH 09/15] drivers: Convert pci_dma_sync_single_for_cpu/device " Jan Kiszka
2022-07-04 13:08 ` [PATCH 10/15] cobalt: Resolve cast-function-type warnings Jan Kiszka
2022-07-04 13:08 ` [PATCH 11/15] drivers/net/experimental/e1000: Use fallthrough Jan Kiszka
2022-07-04 13:08 ` [PATCH 12/15] drivers/spi: Convert to GPIO descriptor API Jan Kiszka
2022-07-04 13:08 ` [PATCH 13/15] drivers/spi: Switch to spi_controller API Jan Kiszka
2022-07-04 13:08 ` [PATCH 14/15] drivers/spi: Account for dropped return value of spi_driver.remove Jan Kiszka
2022-07-04 13:08 ` [PATCH 15/15] ci: Add targets for latest dovetail queue Jan Kiszka
2022-07-04 13:35 ` [PATCH 00/15] Kernel 5.19 adjustments Philippe Gerum
2022-07-04 13:51   ` Jan Kiszka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=4808964f18dc64761da8dc5c9e6f3345df8f76ea.1656940114.git.jan.kiszka@siemens.com \
    --to=jan.kiszka@siemens.com \
    --cc=xenomai@xenomai.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.