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

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

iwlwifi: rename iwl-4965-debug.h back to iwl-debug.h 



This patch removes iwl-4965-debug.h to iwl-debug.h
It will be used by more NICs

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 8236e183

drivers/net/wireless/iwlwifi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ config IWL4965_SENSITIVITY 
	  This option will enable sensitivity calibration for the iwl4965

	  driver.



config IWL4965_DEBUG

config IWLWIFI_DEBUG

	bool "Enable full debugging output in iwl4965 driver"

	depends on IWL4965

	---help---

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

+18 −18
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 


#include <linux/io.h>



#include "iwl-4965-debug.h"

#include "iwl-debug.h"



/*

 * IO, register, and NIC memory access functions
@@ -60,7 +60,7 @@ 
 */



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

#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

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

				 u32 ofs, u32 val)

{
@@ -74,7 +74,7 @@ static inline void __iwl4965_write32(const char *f, u32 l, struct iwl4965_priv * 
#endif



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

#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

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

{

	IWL_DEBUG_IO("read_direct32(0x%08X) - %s %d\n", ofs, f, l);
@@ -99,7 +99,7 @@ static inline int _iwl4965_poll_bit(struct iwl4965_priv *priv, u32 addr, 


	return -ETIMEDOUT;

}

#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

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

				 struct iwl4965_priv *priv, u32 addr,

				 u32 bits, u32 mask, int timeout)
@@ -120,7 +120,7 @@ static inline void _iwl4965_set_bit(struct iwl4965_priv *priv, u32 reg, u32 mask 
{

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

}

#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

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

				 struct iwl4965_priv *priv, u32 reg, u32 mask)

{
@@ -137,7 +137,7 @@ static inline void _iwl4965_clear_bit(struct iwl4965_priv *priv, u32 reg, u32 ma 
{

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

}

#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

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

				   struct iwl4965_priv *priv, u32 reg, u32 mask)

{
@@ -155,7 +155,7 @@ static inline int _iwl4965_grab_nic_access(struct iwl4965_priv *priv) 
	int ret;

	u32 gp_ctl;



#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

	if (atomic_read(&priv->restrict_refcnt))

		return 0;

#endif
@@ -186,13 +186,13 @@ static inline int _iwl4965_grab_nic_access(struct iwl4965_priv *priv) 
		return -EIO;

	}



#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

	atomic_inc(&priv->restrict_refcnt);

#endif

	return 0;

}



#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

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

					       struct iwl4965_priv *priv)

{
@@ -212,13 +212,13 @@ static inline int __iwl4965_grab_nic_access(const char *f, u32 l, 


static inline void _iwl4965_release_nic_access(struct iwl4965_priv *priv)

{

#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

	if (atomic_dec_and_test(&priv->restrict_refcnt))

#endif

		_iwl4965_clear_bit(priv, CSR_GP_CNTRL,

			       CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);

}

#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

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

					    struct iwl4965_priv *priv)

{
@@ -239,7 +239,7 @@ static inline u32 _iwl4965_read_direct32(struct iwl4965_priv *priv, u32 reg) 
{

	return _iwl4965_read32(priv, reg);

}

#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

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

					struct iwl4965_priv *priv, u32 reg)

{
@@ -261,7 +261,7 @@ static inline void _iwl4965_write_direct32(struct iwl4965_priv *priv, 
{

	_iwl4965_write32(priv, reg, value);

}

#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

static void __iwl4965_write_direct32(u32 line,

				   struct iwl4965_priv *priv, u32 reg, u32 value)

{
@@ -301,7 +301,7 @@ static inline int _iwl4965_poll_direct_bit(struct iwl4965_priv *priv, 
	return -ETIMEDOUT;

}



#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

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

					    struct iwl4965_priv *priv,

					    u32 addr, u32 mask, int timeout)
@@ -327,7 +327,7 @@ static inline u32 _iwl4965_read_prph(struct iwl4965_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_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

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

{

	if (!atomic_read(&priv->restrict_refcnt))
@@ -348,7 +348,7 @@ static inline void _iwl4965_write_prph(struct iwl4965_priv *priv, 
			      ((addr & 0x0000FFFF) | (3 << 24)));

	_iwl4965_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val);

}

#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

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

					      u32 addr, u32 val)

{
@@ -365,7 +365,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_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

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

					u32 reg, u32 mask)

{
@@ -383,7 +383,7 @@ static inline void __iwl4965_set_bits_prph(u32 line, struct iwl4965_priv *priv, 
#define _iwl4965_set_bits_mask_prph(priv, reg, bits, mask) \

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



#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

static inline void __iwl4965_set_bits_mask_prph(u32 line,

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

{

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

+2 −2
Original line number Diff line number Diff line
@@ -244,7 +244,7 @@ static inline u8 iwl4965_rate_get_rate(u32 rate_n_flags) 
static int rs_send_lq_cmd(struct iwl4965_priv *priv,

			  struct iwl4965_link_quality_cmd *lq, u8 flags)

{

#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

	int i;

#endif

	struct iwl4965_host_cmd cmd = {
@@ -265,7 +265,7 @@ static int rs_send_lq_cmd(struct iwl4965_priv *priv, 
	IWL_DEBUG_RATE("lq dta 0x%X 0x%X\n",

		       lq->general_params.single_stream_ant_msk,

		       lq->general_params.dual_stream_ant_msk);

#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

	for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)

		IWL_DEBUG_RATE("lq index %d 0x%X\n",

				i, lq->rs_table[i].rate_n_flags);

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

+3 −3
Original line number Diff line number Diff line
@@ -3583,7 +3583,7 @@ static void iwl4965_update_ps_mode(struct iwl4965_priv *priv, u16 ps_bit, u8 *ad 
		}

	}

}

#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG



/**

 * iwl4965_dbg_report_frame - dump frame to syslog during debug sessions
@@ -3623,7 +3623,7 @@ static void iwl4965_dbg_report_frame(struct iwl4965_priv *priv, 
	struct iwl4965_rx_frame_end *rx_end = IWL_RX_END(pkt);

	u8 *data = IWL_RX_DATA(pkt);



	if (likely(!(iwl4965_debug_level & IWL_DL_RX)))

	if (likely(!(iwl_debug_level & IWL_DL_RX)))

		return;



	/* MAC header */
@@ -3726,7 +3726,7 @@ static void iwl4965_dbg_report_frame(struct iwl4965_priv *priv, 
		}

	}

	if (print_dump)

		iwl4965_print_hex_dump(IWL_DL_RX, data, length);

		iwl_print_hex_dump(IWL_DL_RX, data, length);

}

#else

static inline void iwl4965_dbg_report_frame(struct iwl4965_priv *priv,

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

+2 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ extern struct pci_device_id iwl4965_hw_card_ids[]; 
#include "iwl-4965-hw.h"

#include "iwl-csr.h"

#include "iwl-prph.h"

#include "iwl-4965-debug.h"

#include "iwl-debug.h"



/* Change firmware file name, using "-" and incrementing number,

 *   *only* when uCode interface or architecture changes so that it
@@ -1202,7 +1202,7 @@ struct iwl4965_priv { 
	u32 pm_state[16];

#endif



#ifdef CONFIG_IWL4965_DEBUG

#ifdef CONFIG_IWLWIFI_DEBUG

	/* debugging info */

	u32 framecnt_to_us;

	atomic_t restrict_refcnt;