iwlwifi: stop passing bogus gfp flags arguments to dma_alloc_coherent

dma_alloc_coherent is not just the page allocator.  The only valid
arguments to pass are either GFP_ATOMIC or GFP_ATOMIC with possible
modifiers of __GFP_NORETRY or __GFP_NOWARN.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
index 1aa880936121538890e260b99137037110d8a60f..f52427ec60e946e5962bbc8c2699a1d5ae652f38 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
+++ b/drivers/net/wireless/intel/iwlwifi/fw/dbg.c
@@ -2485,8 +2485,7 @@ iwl_fw_dbg_buffer_allocation(struct iwl_fw_runtime *fwrt, u32 size)
 
        virtual_addr =
                dma_alloc_coherent(fwrt->trans->dev, size, &phys_addr,
-                                  GFP_KERNEL | __GFP_NOWARN | __GFP_ZERO |
-                                  __GFP_COMP);
+                                  GFP_KERNEL | __GFP_NOWARN);
 
        /* TODO: alloc fragments if needed */
        if (!virtual_addr)

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index 073d2ec993486b7642af8e869cf79d2682ed4ca2..d15a667600cd6f834df4f51efc21dcb404c775d7 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -215,8 +215,7 @@ static void iwl_pcie_alloc_fw_monitor_block(struct iwl_trans *trans,
        for (power = max_power; power >= min_power; power--) {
                size = BIT(power);
                cpu_addr = dma_alloc_coherent(trans->dev, size, &phys,
-                                             GFP_KERNEL | __GFP_NOWARN |
-                                             __GFP_ZERO | __GFP_COMP);
+                                             GFP_KERNEL | __GFP_NOWARN);
                if (!cpu_addr)
                        continue;