vrx518_ep: fix compilation error with kernel 6.1
authorAndre Heider <a.heider@gmail.com>
Tue, 22 Aug 2023 11:07:02 +0000 (13:07 +0200)
committerHauke Mehrtens <hauke@hauke-m.de>
Sun, 27 Aug 2023 17:26:53 +0000 (19:26 +0200)
Unconditionally use the newer APIs, since our oldest supported kernel
contains them too.

Signed-off-by: Andre Heider <a.heider@gmail.com>
package/kernel/lantiq/vrx518_ep/patches/100-compat.patch

index f5b917e7078238e0e2b9c973ba7f6b3dd7163085..a139c7a862461b84542a8228c2fdbf7ce7619f5a 100644 (file)
                dev_err(&pdev->dev,
                        "%s: Failed to enable MSI interrupts error code: %d\n",
                        __func__, err);
+@@ -589,15 +589,15 @@ static int dc_ep_probe(struct pci_dev *p
+       /* Target structures have a limit of 32 bit DMA pointers.
+        * DMA pointers can be wider than 32 bits by default on some systems.
+        */
+-      ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
++      ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
+       if (ret) {
+               dev_err(&pdev->dev, "32-bit DMA not available: %d\n", ret);
+               goto err_region;
+       }
+-      ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
++      ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
+       if (ret) {
+-              dev_err(&pdev->dev, "cannot enable 32-bit consistent DMA\n");
++              dev_err(&pdev->dev, "cannot enable 32-bit coherent DMA\n");
+               goto err_region;
+       }
 @@ -654,7 +654,7 @@ static int dc_ep_probe(struct pci_dev *p
                goto err_iomap;