iwlwifi: trans: remove suspending flag

This is set but never read.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
index 20251f5e6f4106dc212eb4726df8b9e3de7bece8..942662eaf523a625ce71d257448e6ed30a7c8a66 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
@@ -841,7 +841,6 @@ struct iwl_trans {
 
        enum iwl_plat_pm_mode system_pm_mode;
        enum iwl_plat_pm_mode runtime_pm_mode;
-       bool suspending;
 
        /* pointer to trans specific struct */
        /*Ensure that this pointer will always be aligned to sizeof pointer */

diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index d9ed53b7c768d631cb67c519f4c898a0e9152e70..63a04cec32afc21d07d797aaa5d7f8b75a9170d2 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -1314,12 +1314,6 @@ static int iwl_pci_system_prepare(struct device *device)
 
        IWL_DEBUG_RPM(trans, "preparing for system suspend\n");
 
-       /* This is called before entering system suspend and before
-        * the runtime resume is called.  Set the suspending flag to
-        * prevent the wakelock from being taken.
-        */
-       trans->suspending = true;
-
        /* Wake the device up from runtime suspend before going to
         * platform suspend.  This is needed because we don't know
         * whether wowlan any is set and, if it's not, mac80211 will
@@ -1336,14 +1330,6 @@ static void iwl_pci_system_complete(struct device *device)
        struct iwl_trans *trans = pci_get_drvdata(pdev);
 
        IWL_DEBUG_RPM(trans, "completing system suspend\n");
-
-       /* This is called as a counterpart to the prepare op.  It is
-        * called either when suspending fails or when suspend
-        * completed successfully.  Now there's no risk of grabbing
-        * the wakelock anymore, so we can release the suspending
-        * flag.
-        */
-       trans->suspending = false;
 }
 #endif /* CONFIG_IWLWIFI_PCIE_RTPM */