diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2021-07-28 18:21:10 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2021-07-28 18:21:10 +0300 |
| commit | b4f8e2d9b5f8ccc4c46bcab203e6d4fa0f6a7251 (patch) | |
| tree | 1d2478ee9e293e0af3f5bdf017e6b40e06e63617 /drivers/net/wireless/ath/ath9k | |
| parent | af996031e1545c47423dfdd024840702ceb5a26c (diff) | |
| parent | 0791ba2bc7d33f544528410d9d77aa1b5018adab (diff) | |
| download | linux-b4f8e2d9b5f8ccc4c46bcab203e6d4fa0f6a7251.tar.xz | |
Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
ath.git patches for v5.15. Major changes:
ath5k, ath9k, ath10k, ath11k:
* switch from 'pci_' to 'dma_' API
Diffstat (limited to 'drivers/net/wireless/ath/ath9k')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/pci.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/wireless/ath/ath9k/pci.c b/drivers/net/wireless/ath/ath9k/pci.c index cff9af3af38d..a074e23013c5 100644 --- a/drivers/net/wireless/ath/ath9k/pci.c +++ b/drivers/net/wireless/ath/ath9k/pci.c @@ -896,18 +896,12 @@ static int ath_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (pcim_enable_device(pdev)) return -EIO; - ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32)); if (ret) { pr_err("32-bit DMA not available\n"); return ret; } - ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); - if (ret) { - pr_err("32-bit DMA consistent DMA enable failed\n"); - return ret; - } - /* * Cache line size is used to size and align various * structures used to communicate with the hardware. |