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

Commit 14335310 authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Merge HWTIMER debug level with BTCOEX 



Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9e49a9d3

drivers/net/wireless/ath/ath.h

+6 −7
Original line number Original line Diff line number Diff line
@@ -239,13 +239,12 @@ enum ATH_DEBUG { 
	ATH_DBG_CONFIG		= 0x00000200,

	ATH_DBG_CONFIG		= 0x00000200,

	ATH_DBG_FATAL		= 0x00000400,

	ATH_DBG_FATAL		= 0x00000400,

	ATH_DBG_PS		= 0x00000800,

	ATH_DBG_PS		= 0x00000800,

	ATH_DBG_HWTIMER		= 0x00001000,

	ATH_DBG_BTCOEX		= 0x00001000,

	ATH_DBG_BTCOEX		= 0x00002000,

	ATH_DBG_WMI		= 0x00002000,

	ATH_DBG_WMI		= 0x00004000,

	ATH_DBG_BSTUCK		= 0x00004000,

	ATH_DBG_BSTUCK		= 0x00008000,

	ATH_DBG_MCI		= 0x00008000,

	ATH_DBG_MCI		= 0x00010000,

	ATH_DBG_DFS		= 0x00010000,

	ATH_DBG_DFS		= 0x00020000,

	ATH_DBG_WOW		= 0x00020000,

	ATH_DBG_WOW		= 0x00040000,

	ATH_DBG_ANY		= 0xffffffff

	ATH_DBG_ANY		= 0xffffffff

};

};

drivers/net/wireless/ath/ath9k/hw.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -3042,7 +3042,7 @@ void ath9k_hw_gen_timer_start(struct ath_hw *ah, 




	timer_next = tsf + trig_timeout;

	timer_next = tsf + trig_timeout;





	ath_dbg(ath9k_hw_common(ah), HWTIMER,

	ath_dbg(ath9k_hw_common(ah), BTCOEX,

		"current tsf %x period %x timer_next %x\n",

		"current tsf %x period %x timer_next %x\n",

		tsf, timer_period, timer_next);

		tsf, timer_period, timer_next);
@@ -3141,7 +3141,7 @@ void ath_gen_timer_isr(struct ath_hw *ah) 
		index = rightmost_index(timer_table, &thresh_mask);

		index = rightmost_index(timer_table, &thresh_mask);

		timer = timer_table->timers[index];

		timer = timer_table->timers[index];

		BUG_ON(!timer);

		BUG_ON(!timer);

		ath_dbg(common, HWTIMER, "TSF overflow for Gen timer %d\n",

		ath_dbg(common, BTCOEX, "TSF overflow for Gen timer %d\n",

			index);

			index);

		timer->overflow(timer->arg);

		timer->overflow(timer->arg);

	}

	}
@@ -3150,7 +3150,7 @@ void ath_gen_timer_isr(struct ath_hw *ah) 
		index = rightmost_index(timer_table, &trigger_mask);

		index = rightmost_index(timer_table, &trigger_mask);

		timer = timer_table->timers[index];

		timer = timer_table->timers[index];

		BUG_ON(!timer);

		BUG_ON(!timer);

		ath_dbg(common, HWTIMER,

		ath_dbg(common, BTCOEX,

			"Gen timer[%d] trigger\n", index);

			"Gen timer[%d] trigger\n", index);

		timer->trigger(timer->arg);

		timer->trigger(timer->arg);

	}

	}