[PATCH net-next 3/3] iwlwifi: use dma_set_mask_and_coherent

[Heiner Kallweit]

Simplify the code by using dma_set_mask_and_coherent().

Signed-off-by: Heiner Kallweit <hkallwe...@gmail.com>
---
 drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c 
b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index 1bf4c37fe..4fd391dda 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -3440,15 +3440,9 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev 
*pdev,
        pci_set_master(pdev);
 
        addr_size = trans->txqs.tfd.addr_size;
-       ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(addr_size));
-       if (!ret)
-               ret = pci_set_consistent_dma_mask(pdev,
-                                                 DMA_BIT_MASK(addr_size));
+       ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(addr_size));
        if (ret) {
-               ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
-               if (!ret)
-                       ret = pci_set_consistent_dma_mask(pdev,
-                                                         DMA_BIT_MASK(32));
+               ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
                /* both attempts failed: */
                if (ret) {
                        dev_err(&pdev->dev, "No suitable DMA available\n");
-- 
2.30.2