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

Commit c79dd5b5 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: rename struct iwl4965_priv to struct iwl_priv 



This patch renames iwl4965_priv to iwl_priv. iwl_priv  will
be shared by more hw.

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0a6857e7

drivers/net/wireless/iwlwifi/iwl-4965-io.h

+29 −29
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 


#define _iwl4965_write32(priv, ofs, val) writel((val), (priv)->hw_base + (ofs))

#ifdef CONFIG_IWLWIFI_DEBUG

static inline void __iwl4965_write32(const char *f, u32 l, struct iwl4965_priv *priv,

static inline void __iwl4965_write32(const char *f, u32 l, struct iwl_priv *priv,

				 u32 ofs, u32 val)

{

	IWL_DEBUG_IO("write32(0x%08X, 0x%08X) - %s %d\n", ofs, val, f, l);
@@ -75,7 +75,7 @@ static inline void __iwl4965_write32(const char *f, u32 l, struct iwl4965_priv * 


#define _iwl4965_read32(priv, ofs) readl((priv)->hw_base + (ofs))

#ifdef CONFIG_IWLWIFI_DEBUG

static inline u32 __iwl4965_read32(char *f, u32 l, struct iwl4965_priv *priv, u32 ofs)

static inline u32 __iwl4965_read32(char *f, u32 l, struct iwl_priv *priv, u32 ofs)

{

	IWL_DEBUG_IO("read_direct32(0x%08X) - %s %d\n", ofs, f, l);

	return _iwl4965_read32(priv, ofs);
@@ -85,7 +85,7 @@ static inline u32 __iwl4965_read32(char *f, u32 l, struct iwl4965_priv *priv, u3 
#define iwl4965_read32(p, o) _iwl4965_read32(p, o)

#endif



static inline int _iwl4965_poll_bit(struct iwl4965_priv *priv, u32 addr,

static inline int _iwl4965_poll_bit(struct iwl_priv *priv, u32 addr,

				u32 bits, u32 mask, int timeout)

{

	int i = 0;
@@ -101,7 +101,7 @@ static inline int _iwl4965_poll_bit(struct iwl4965_priv *priv, u32 addr, 
}

#ifdef CONFIG_IWLWIFI_DEBUG

static inline int __iwl4965_poll_bit(const char *f, u32 l,

				 struct iwl4965_priv *priv, u32 addr,

				 struct iwl_priv *priv, u32 addr,

				 u32 bits, u32 mask, int timeout)

{

	int ret = _iwl4965_poll_bit(priv, addr, bits, mask, timeout);
@@ -116,13 +116,13 @@ static inline int __iwl4965_poll_bit(const char *f, u32 l, 
#define iwl4965_poll_bit(p, a, b, m, t) _iwl4965_poll_bit(p, a, b, m, t)

#endif



static inline void _iwl4965_set_bit(struct iwl4965_priv *priv, u32 reg, u32 mask)

static inline void _iwl4965_set_bit(struct iwl_priv *priv, u32 reg, u32 mask)

{

	_iwl4965_write32(priv, reg, _iwl4965_read32(priv, reg) | mask);

}

#ifdef CONFIG_IWLWIFI_DEBUG

static inline void __iwl4965_set_bit(const char *f, u32 l,

				 struct iwl4965_priv *priv, u32 reg, u32 mask)

				 struct iwl_priv *priv, u32 reg, u32 mask)

{

	u32 val = _iwl4965_read32(priv, reg) | mask;

	IWL_DEBUG_IO("set_bit(0x%08X, 0x%08X) = 0x%08X\n", reg, mask, val);
@@ -133,13 +133,13 @@ static inline void __iwl4965_set_bit(const char *f, u32 l, 
#define iwl4965_set_bit(p, r, m) _iwl4965_set_bit(p, r, m)

#endif



static inline void _iwl4965_clear_bit(struct iwl4965_priv *priv, u32 reg, u32 mask)

static inline void _iwl4965_clear_bit(struct iwl_priv *priv, u32 reg, u32 mask)

{

	_iwl4965_write32(priv, reg, _iwl4965_read32(priv, reg) & ~mask);

}

#ifdef CONFIG_IWLWIFI_DEBUG

static inline void __iwl4965_clear_bit(const char *f, u32 l,

				   struct iwl4965_priv *priv, u32 reg, u32 mask)

				   struct iwl_priv *priv, u32 reg, u32 mask)

{

	u32 val = _iwl4965_read32(priv, reg) & ~mask;

	IWL_DEBUG_IO("clear_bit(0x%08X, 0x%08X) = 0x%08X\n", reg, mask, val);
@@ -150,7 +150,7 @@ static inline void __iwl4965_clear_bit(const char *f, u32 l, 
#define iwl4965_clear_bit(p, r, m) _iwl4965_clear_bit(p, r, m)

#endif



static inline int _iwl4965_grab_nic_access(struct iwl4965_priv *priv)

static inline int _iwl4965_grab_nic_access(struct iwl_priv *priv)

{

	int ret;

	u32 gp_ctl;
@@ -194,7 +194,7 @@ static inline int _iwl4965_grab_nic_access(struct iwl4965_priv *priv) 


#ifdef CONFIG_IWLWIFI_DEBUG

static inline int __iwl4965_grab_nic_access(const char *f, u32 l,

					       struct iwl4965_priv *priv)

					       struct iwl_priv *priv)

{

	if (atomic_read(&priv->restrict_refcnt))

		IWL_DEBUG_INFO("Grabbing access while already held at "
@@ -210,7 +210,7 @@ static inline int __iwl4965_grab_nic_access(const char *f, u32 l, 
	_iwl4965_grab_nic_access(priv)

#endif



static inline void _iwl4965_release_nic_access(struct iwl4965_priv *priv)

static inline void _iwl4965_release_nic_access(struct iwl_priv *priv)

{

#ifdef CONFIG_IWLWIFI_DEBUG

	if (atomic_dec_and_test(&priv->restrict_refcnt))
@@ -220,7 +220,7 @@ static inline void _iwl4965_release_nic_access(struct iwl4965_priv *priv) 
}

#ifdef CONFIG_IWLWIFI_DEBUG

static inline void __iwl4965_release_nic_access(const char *f, u32 l,

					    struct iwl4965_priv *priv)

					    struct iwl_priv *priv)

{

	if (atomic_read(&priv->restrict_refcnt) <= 0)

		IWL_ERROR("Release unheld nic access at line %d.\n", l);
@@ -235,13 +235,13 @@ static inline void __iwl4965_release_nic_access(const char *f, u32 l, 
	_iwl4965_release_nic_access(priv)

#endif



static inline u32 _iwl4965_read_direct32(struct iwl4965_priv *priv, u32 reg)

static inline u32 _iwl4965_read_direct32(struct iwl_priv *priv, u32 reg)

{

	return _iwl4965_read32(priv, reg);

}

#ifdef CONFIG_IWLWIFI_DEBUG

static inline u32 __iwl4965_read_direct32(const char *f, u32 l,

					struct iwl4965_priv *priv, u32 reg)

					struct iwl_priv *priv, u32 reg)

{

	u32 value = _iwl4965_read_direct32(priv, reg);

	if (!atomic_read(&priv->restrict_refcnt))
@@ -256,14 +256,14 @@ static inline u32 __iwl4965_read_direct32(const char *f, u32 l, 
#define iwl4965_read_direct32 _iwl4965_read_direct32

#endif



static inline void _iwl4965_write_direct32(struct iwl4965_priv *priv,

static inline void _iwl4965_write_direct32(struct iwl_priv *priv,

					 u32 reg, u32 value)

{

	_iwl4965_write32(priv, reg, value);

}

#ifdef CONFIG_IWLWIFI_DEBUG

static void __iwl4965_write_direct32(u32 line,

				   struct iwl4965_priv *priv, u32 reg, u32 value)

				   struct iwl_priv *priv, u32 reg, u32 value)

{

	if (!atomic_read(&priv->restrict_refcnt))

		IWL_ERROR("Nic access not held from line %d\n", line);
@@ -275,7 +275,7 @@ static void __iwl4965_write_direct32(u32 line, 
#define iwl4965_write_direct32 _iwl4965_write_direct32

#endif



static inline void iwl4965_write_reg_buf(struct iwl4965_priv *priv,

static inline void iwl4965_write_reg_buf(struct iwl_priv *priv,

					       u32 reg, u32 len, u32 *values)

{

	u32 count = sizeof(u32);
@@ -286,7 +286,7 @@ static inline void iwl4965_write_reg_buf(struct iwl4965_priv *priv, 
	}

}



static inline int _iwl4965_poll_direct_bit(struct iwl4965_priv *priv,

static inline int _iwl4965_poll_direct_bit(struct iwl_priv *priv,

					   u32 addr, u32 mask, int timeout)

{

	int i = 0;
@@ -303,7 +303,7 @@ static inline int _iwl4965_poll_direct_bit(struct iwl4965_priv *priv, 


#ifdef CONFIG_IWLWIFI_DEBUG

static inline int __iwl4965_poll_direct_bit(const char *f, u32 l,

					    struct iwl4965_priv *priv,

					    struct iwl_priv *priv,

					    u32 addr, u32 mask, int timeout)

{

	int ret  = _iwl4965_poll_direct_bit(priv, addr, mask, timeout);
@@ -322,13 +322,13 @@ static inline int __iwl4965_poll_direct_bit(const char *f, u32 l, 
#define iwl4965_poll_direct_bit _iwl4965_poll_direct_bit

#endif



static inline u32 _iwl4965_read_prph(struct iwl4965_priv *priv, u32 reg)

static inline u32 _iwl4965_read_prph(struct iwl_priv *priv, u32 reg)

{

	_iwl4965_write_direct32(priv, HBUS_TARG_PRPH_RADDR, reg | (3 << 24));

	return _iwl4965_read_direct32(priv, HBUS_TARG_PRPH_RDAT);

}

#ifdef CONFIG_IWLWIFI_DEBUG

static inline u32 __iwl4965_read_prph(u32 line, struct iwl4965_priv *priv, u32 reg)

static inline u32 __iwl4965_read_prph(u32 line, struct iwl_priv *priv, u32 reg)

{

	if (!atomic_read(&priv->restrict_refcnt))

		IWL_ERROR("Nic access not held from line %d\n", line);
@@ -341,7 +341,7 @@ static inline u32 __iwl4965_read_prph(u32 line, struct iwl4965_priv *priv, u32 r 
#define iwl4965_read_prph _iwl4965_read_prph

#endif



static inline void _iwl4965_write_prph(struct iwl4965_priv *priv,

static inline void _iwl4965_write_prph(struct iwl_priv *priv,

					     u32 addr, u32 val)

{

	_iwl4965_write_direct32(priv, HBUS_TARG_PRPH_WADDR,
@@ -349,7 +349,7 @@ static inline void _iwl4965_write_prph(struct iwl4965_priv *priv, 
	_iwl4965_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val);

}

#ifdef CONFIG_IWLWIFI_DEBUG

static inline void __iwl4965_write_prph(u32 line, struct iwl4965_priv *priv,

static inline void __iwl4965_write_prph(u32 line, struct iwl_priv *priv,

					      u32 addr, u32 val)

{

	if (!atomic_read(&priv->restrict_refcnt))
@@ -366,7 +366,7 @@ static inline void __iwl4965_write_prph(u32 line, struct iwl4965_priv *priv, 
#define _iwl4965_set_bits_prph(priv, reg, mask) \

	_iwl4965_write_prph(priv, reg, (_iwl4965_read_prph(priv, reg) | mask))

#ifdef CONFIG_IWLWIFI_DEBUG

static inline void __iwl4965_set_bits_prph(u32 line, struct iwl4965_priv *priv,

static inline void __iwl4965_set_bits_prph(u32 line, struct iwl_priv *priv,

					u32 reg, u32 mask)

{

	if (!atomic_read(&priv->restrict_refcnt))
@@ -385,7 +385,7 @@ static inline void __iwl4965_set_bits_prph(u32 line, struct iwl4965_priv *priv, 


#ifdef CONFIG_IWLWIFI_DEBUG

static inline void __iwl4965_set_bits_mask_prph(u32 line,

		struct iwl4965_priv *priv, u32 reg, u32 bits, u32 mask)

		struct iwl_priv *priv, u32 reg, u32 bits, u32 mask)

{

	if (!atomic_read(&priv->restrict_refcnt))

		IWL_ERROR("Nic access not held from line %d\n", line);
@@ -397,26 +397,26 @@ static inline void __iwl4965_set_bits_mask_prph(u32 line, 
#define iwl4965_set_bits_mask_prph _iwl4965_set_bits_mask_prph

#endif



static inline void iwl4965_clear_bits_prph(struct iwl4965_priv

static inline void iwl4965_clear_bits_prph(struct iwl_priv

						 *priv, u32 reg, u32 mask)

{

	u32 val = _iwl4965_read_prph(priv, reg);

	_iwl4965_write_prph(priv, reg, (val & ~mask));

}



static inline u32 iwl4965_read_targ_mem(struct iwl4965_priv *priv, u32 addr)

static inline u32 iwl4965_read_targ_mem(struct iwl_priv *priv, u32 addr)

{

	iwl4965_write_direct32(priv, HBUS_TARG_MEM_RADDR, addr);

	return iwl4965_read_direct32(priv, HBUS_TARG_MEM_RDAT);

}



static inline void iwl4965_write_targ_mem(struct iwl4965_priv *priv, u32 addr, u32 val)

static inline void iwl4965_write_targ_mem(struct iwl_priv *priv, u32 addr, u32 val)

{

	iwl4965_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);

	iwl4965_write_direct32(priv, HBUS_TARG_MEM_WDAT, val);

}



static inline void iwl4965_write_targ_mem_buf(struct iwl4965_priv *priv, u32 addr,

static inline void iwl4965_write_targ_mem_buf(struct iwl_priv *priv, u32 addr,

					  u32 len, u32 *values)

{

	iwl4965_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);

drivers/net/wireless/iwlwifi/iwl-4965-rs.c

+21 −21
Original line number Diff line number Diff line
@@ -162,11 +162,11 @@ struct iwl4965_lq_sta { 
	struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;

#endif

	struct iwl4965_rate dbg_fixed;

	struct iwl4965_priv *drv;

	struct iwl_priv *drv;

#endif

};



static void rs_rate_scale_perform(struct iwl4965_priv *priv,

static void rs_rate_scale_perform(struct iwl_priv *priv,

				   struct net_device *dev,

				   struct ieee80211_hdr *hdr,

				   struct sta_info *sta);
@@ -229,7 +229,7 @@ static s32 expected_tpt_mimo40MHzSGI[IWL_RATE_COUNT] = { 
	0, 0, 0, 0, 131, 131, 191, 222, 242, 270, 284, 289, 293

};



static int iwl4965_lq_sync_callback(struct iwl4965_priv *priv,

static int iwl4965_lq_sync_callback(struct iwl_priv *priv,

				struct iwl4965_cmd *cmd, struct sk_buff *skb)

{

	/*We didn't cache the SKB; let the caller free it */
@@ -241,7 +241,7 @@ static inline u8 iwl4965_rate_get_rate(u32 rate_n_flags) 
	return (u8)(rate_n_flags & 0xFF);

}



static int rs_send_lq_cmd(struct iwl4965_priv *priv,

static int rs_send_lq_cmd(struct iwl_priv *priv,

			  struct iwl4965_link_quality_cmd *lq, u8 flags)

{

#ifdef CONFIG_IWLWIFI_DEBUG
@@ -388,7 +388,7 @@ static u32 rs_tl_get_load(struct iwl4965_lq_sta *lq_data, u8 tid) 
	return tl->total;

}



static void rs_tl_turn_on_agg_for_tid(struct iwl4965_priv *priv,

static void rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,

				struct iwl4965_lq_sta *lq_data, u8 tid,

				struct sta_info *sta)

{
@@ -407,7 +407,7 @@ static void rs_tl_turn_on_agg_for_tid(struct iwl4965_priv *priv, 
	}

}



static void rs_tl_turn_on_agg(struct iwl4965_priv *priv, u8 tid,

static void rs_tl_turn_on_agg(struct iwl_priv *priv, u8 tid,

				struct iwl4965_lq_sta *lq_data,

				struct sta_info *sta)

{
@@ -658,7 +658,7 @@ static inline void rs_toggle_antenna(struct iwl4965_rate *new_rate, 
	}

}



static inline u8 rs_use_green(struct iwl4965_priv *priv,

static inline u8 rs_use_green(struct iwl_priv *priv,

			      struct ieee80211_conf *conf)

{

#ifdef CONFIG_IWL4965_HT
@@ -821,7 +821,7 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev, 
	struct iwl4965_link_quality_cmd *table;

	struct sta_info *sta;

	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct iwl4965_priv *priv = (struct iwl4965_priv *)priv_rate;

	struct iwl_priv *priv = (struct iwl_priv *)priv_rate;

	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);

	struct ieee80211_hw *hw = local_to_hw(local);

	struct iwl4965_rate_scale_data *window = NULL;
@@ -1128,7 +1128,7 @@ static void rs_get_expected_tpt_table(struct iwl4965_lq_sta *lq_sta, 
 * to decrease to match "active" throughput.  When moving from MIMO to SISO,

 * bit rate will typically need to increase, but not if performance was bad.

 */

static s32 rs_get_best_rate(struct iwl4965_priv *priv,

static s32 rs_get_best_rate(struct iwl_priv *priv,

			    struct iwl4965_lq_sta *lq_sta,

			    struct iwl4965_scale_tbl_info *tbl,	/* "search" */

			    u16 rate_mask, s8 index, s8 rate)
@@ -1226,7 +1226,7 @@ static inline u8 rs_is_both_ant_supp(u8 valid_antenna) 
/*

 * Set up search table for MIMO

 */

static int rs_switch_to_mimo(struct iwl4965_priv *priv,

static int rs_switch_to_mimo(struct iwl_priv *priv,

			     struct iwl4965_lq_sta *lq_sta,

			     struct ieee80211_conf *conf,

			     struct sta_info *sta,
@@ -1291,7 +1291,7 @@ static int rs_switch_to_mimo(struct iwl4965_priv *priv, 
/*

 * Set up search table for SISO

 */

static int rs_switch_to_siso(struct iwl4965_priv *priv,

static int rs_switch_to_siso(struct iwl_priv *priv,

			     struct iwl4965_lq_sta *lq_sta,

			     struct ieee80211_conf *conf,

			     struct sta_info *sta,
@@ -1354,7 +1354,7 @@ static int rs_switch_to_siso(struct iwl4965_priv *priv, 
/*

 * Try to switch to new modulation mode from legacy

 */

static int rs_move_legacy_other(struct iwl4965_priv *priv,

static int rs_move_legacy_other(struct iwl_priv *priv,

				struct iwl4965_lq_sta *lq_sta,

				struct ieee80211_conf *conf,

				struct sta_info *sta,
@@ -1452,7 +1452,7 @@ static int rs_move_legacy_other(struct iwl4965_priv *priv, 
/*

 * Try to switch to new modulation mode from SISO

 */

static int rs_move_siso_to_other(struct iwl4965_priv *priv,

static int rs_move_siso_to_other(struct iwl_priv *priv,

				 struct iwl4965_lq_sta *lq_sta,

				 struct ieee80211_conf *conf,

				 struct sta_info *sta,
@@ -1548,7 +1548,7 @@ static int rs_move_siso_to_other(struct iwl4965_priv *priv, 
/*

 * Try to switch to new modulation mode from MIMO

 */

static int rs_move_mimo_to_other(struct iwl4965_priv *priv,

static int rs_move_mimo_to_other(struct iwl_priv *priv,

				 struct iwl4965_lq_sta *lq_sta,

				 struct ieee80211_conf *conf,

				 struct sta_info *sta,
@@ -1728,7 +1728,7 @@ static void rs_stay_in_table(struct iwl4965_lq_sta *lq_sta) 
/*

 * Do rate scaling and search for new modulation mode.

 */

static void rs_rate_scale_perform(struct iwl4965_priv *priv,

static void rs_rate_scale_perform(struct iwl_priv *priv,

				  struct net_device *dev,

				  struct ieee80211_hdr *hdr,

				  struct sta_info *sta)
@@ -2148,7 +2148,7 @@ static void rs_rate_scale_perform(struct iwl4965_priv *priv, 
}





static void rs_initialize_lq(struct iwl4965_priv *priv,

static void rs_initialize_lq(struct iwl_priv *priv,

			     struct ieee80211_conf *conf,

			     struct sta_info *sta)

{
@@ -2213,7 +2213,7 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev, 
	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	struct sta_info *sta;

	u16 fc;

	struct iwl4965_priv *priv = (struct iwl4965_priv *)priv_rate;

	struct iwl_priv *priv = (struct iwl_priv *)priv_rate;

	struct iwl4965_lq_sta *lq_sta;



	IWL_DEBUG_RATE_LIMIT("rate scale calculate new rate for skb\n");
@@ -2294,7 +2294,7 @@ static void rs_rate_init(void *priv_rate, void *priv_sta, 
	int i, j;

	struct ieee80211_conf *conf = &local->hw.conf;

	struct ieee80211_supported_band *sband;

	struct iwl4965_priv *priv = (struct iwl4965_priv *)priv_rate;

	struct iwl_priv *priv = (struct iwl_priv *)priv_rate;

	struct iwl4965_lq_sta *lq_sta = priv_sta;



	sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
@@ -2516,7 +2516,7 @@ static void rs_free(void *priv_rate) 


static void rs_clear(void *priv_rate)

{

	struct iwl4965_priv *priv = (struct iwl4965_priv *) priv_rate;

	struct iwl_priv *priv = (struct iwl_priv *) priv_rate;



	IWL_DEBUG_RATE("enter\n");
@@ -2726,7 +2726,7 @@ static struct rate_control_ops rs_ops = { 
int iwl4965_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)

{

	struct ieee80211_local *local = hw_to_local(hw);

	struct iwl4965_priv *priv = hw->priv;

	struct iwl_priv *priv = hw->priv;

	struct iwl4965_lq_sta *lq_sta;

	struct sta_info *sta;

	int cnt = 0, i;
@@ -2816,7 +2816,7 @@ int iwl4965_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id) 


void iwl4965_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)

{

	struct iwl4965_priv *priv = hw->priv;

	struct iwl_priv *priv = hw->priv;



	priv->lq_mngr.lq_ready = 1;

}