Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c01a4047 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlagn: clean up PM code 



The transport callbacks might as well be undefined
when CONFIG_PM_SLEEP is not set, so ifdef all of
it out and make everything available for PM_SLEEP
only.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 72afb108

drivers/net/wireless/iwlwifi/iwl-agn.c

+3 −3
Original line number Diff line number Diff line
@@ -1919,7 +1919,7 @@ static void iwlagn_mac_stop(struct ieee80211_hw *hw) 
	IWL_DEBUG_MAC80211(priv, "leave\n");

}



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static int iwlagn_send_patterns(struct iwl_priv *priv,

				struct cfg80211_wowlan *wowlan)

{
@@ -1994,7 +1994,7 @@ struct wowlan_key_data { 
	bool error, use_rsc_tsc, use_tkip;

};



#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

static void iwlagn_convert_p1k(u16 *p1k, __le16 *out)

{

	int i;
@@ -3203,7 +3203,7 @@ struct ieee80211_ops iwlagn_hw_ops = { 
	.tx = iwlagn_mac_tx,

	.start = iwlagn_mac_start,

	.stop = iwlagn_mac_stop,

#ifdef CONFIG_PM

#ifdef CONFIG_PM_SLEEP

	.suspend = iwlagn_mac_suspend,

	.resume = iwlagn_mac_resume,

#endif

drivers/net/wireless/iwlwifi/iwl-trans-pcie.c

+4 −10
Original line number Diff line number Diff line
@@ -1363,8 +1363,7 @@ static void iwl_trans_pcie_free(struct iwl_trans *trans) 
	kfree(trans);

}



#ifdef CONFIG_PM



#ifdef CONFIG_PM_SLEEP

static int iwl_trans_pcie_suspend(struct iwl_trans *trans)

{

	/*
@@ -1402,14 +1401,7 @@ static int iwl_trans_pcie_resume(struct iwl_trans *trans) 


	return 0;

}

#else /* CONFIG_PM */

static int iwl_trans_pcie_suspend(struct iwl_trans *trans)

{ return 0; }



static int iwl_trans_pcie_resume(struct iwl_trans *trans)

{ return 0; }



#endif /* CONFIG_PM */

#endif /* CONFIG_PM_SLEEP */



static void iwl_trans_pcie_wake_any_queue(struct iwl_trans *trans,

					  enum iwl_rxon_context_id ctx)
@@ -1989,6 +1981,8 @@ const struct iwl_trans_ops trans_ops_pcie = { 
	.wait_tx_queue_empty = iwl_trans_pcie_wait_tx_queue_empty,

	.check_stuck_queue = iwl_trans_pcie_check_stuck_queue,



#ifdef CONFIG_PM_SLEEP

	.suspend = iwl_trans_pcie_suspend,

	.resume = iwl_trans_pcie_resume,

#endif

};

drivers/net/wireless/iwlwifi/iwl-trans.h

+4 −1
Original line number Diff line number Diff line
@@ -208,9 +208,10 @@ struct iwl_trans_ops { 
	int (*dbgfs_register)(struct iwl_trans *trans, struct dentry* dir);

	int (*check_stuck_queue)(struct iwl_trans *trans, int q);

	int (*wait_tx_queue_empty)(struct iwl_trans *trans);



#ifdef CONFIG_PM_SLEEP

	int (*suspend)(struct iwl_trans *trans);

	int (*resume)(struct iwl_trans *trans);

#endif

};



/**
@@ -337,6 +338,7 @@ static inline int iwl_trans_dbgfs_register(struct iwl_trans *trans, 
	return trans->ops->dbgfs_register(trans, dir);

}



#ifdef CONFIG_PM_SLEEP

static inline int iwl_trans_suspend(struct iwl_trans *trans)

{

	return trans->ops->suspend(trans);
@@ -346,6 +348,7 @@ static inline int iwl_trans_resume(struct iwl_trans *trans) 
{

	return trans->ops->resume(trans);

}

#endif



/*****************************************************

* Transport layers implementations