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

Commit af08687b authored by Joe Perches's avatar Joe Perches Committed by John W. Linville
Browse files

rtlwifi: Standardize RT_PRINT_DATA macro and uses 



Use a single printk(KERN_DEBUG to emit the header line
to avoid any possible output interleaving.

Remove unnecessary parentheses from the calling uses.
Standardize header arg without trailing \n or colon.
Fix a few pairwiase/pairwise typos.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 884dd244

drivers/net/wireless/rtlwifi/debug.h

+3 −4
Original line number Original line Diff line number Diff line
@@ -189,10 +189,9 @@ do { \ 
do {									\

do {									\

	if (unlikely(((_comp) & rtlpriv->dbg.global_debugcomponents) &&	\

	if (unlikely(((_comp) & rtlpriv->dbg.global_debugcomponents) &&	\

		     (_level <= rtlpriv->dbg.global_debuglevel))) {	\

		     (_level <= rtlpriv->dbg.global_debuglevel))) {	\

		printk(KERN_DEBUG "%s: ", KBUILD_MODNAME);		\

		printk(KERN_DEBUG "%s: In process \"%s\" (pid %i): %s\n", \

		pr_cont("In process \"%s\" (pid %i):",			\

		       KBUILD_MODNAME, current->comm, current->pid,	\

			current->comm, current->pid);			\

		       _titlestring);					\

		printk(_titlestring);					\

		print_hex_dump_bytes("", DUMP_PREFIX_NONE,		\

		print_hex_dump_bytes("", DUMP_PREFIX_NONE,		\

				     _hexdata, _hexdatalen);		\

				     _hexdata, _hexdatalen);		\

	}								\

	}								\

drivers/net/wireless/rtlwifi/efuse.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -478,7 +478,7 @@ bool efuse_shadow_update(struct ieee80211_hw *hw) 
			       &rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base],

			       &rtlefuse->efuse_map[EFUSE_MODIFY_MAP][base],

			       8);

			       8);

			RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_LOUD,

			RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_LOUD,

				      ("U-efuse\n"), tmpdata, 8);

				      "U-efuse", tmpdata, 8);





			if (!efuse_pg_packet_write(hw, (u8) offset, word_en,

			if (!efuse_pg_packet_write(hw, (u8) offset, word_en,

						   tmpdata)) {

						   tmpdata)) {

drivers/net/wireless/rtlwifi/rtl8192c/fw_common.c

+4 −5
Original line number Original line Diff line number Diff line
@@ -570,7 +570,7 @@ void rtl92c_set_fw_pwrmode_cmd(struct ieee80211_hw *hw, u8 mode) 
					      ppsc->reg_max_lps_awakeintvl);

					      ppsc->reg_max_lps_awakeintvl);





	RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,

	RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,

		      "rtl92c_set_fw_rsvdpagepkt(): u1_h2c_set_pwrmode\n",

		      "rtl92c_set_fw_rsvdpagepkt(): u1_h2c_set_pwrmode",

		      u1_h2c_set_pwrmode, 3);

		      u1_h2c_set_pwrmode, 3);

	rtl92c_fill_h2c_cmd(hw, H2C_SETPWRMODE, 3, u1_h2c_set_pwrmode);

	rtl92c_fill_h2c_cmd(hw, H2C_SETPWRMODE, 3, u1_h2c_set_pwrmode);
@@ -780,10 +780,10 @@ void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished) 
	totalpacketlen = TOTAL_RESERVED_PKT_LEN;

	totalpacketlen = TOTAL_RESERVED_PKT_LEN;





	RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,

	RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,

		      "rtl92c_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",

		      "rtl92c_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL",

		      &reserved_page_packet[0], totalpacketlen);

		      &reserved_page_packet[0], totalpacketlen);

	RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,

	RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,

		      "rtl92c_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL\n",

		      "rtl92c_set_fw_rsvdpagepkt(): HW_VAR_SET_TX_CMD: ALL",

		      u1RsvdPageLoc, 3);

		      u1RsvdPageLoc, 3);
@@ -800,8 +800,7 @@ void rtl92c_set_fw_rsvdpagepkt(struct ieee80211_hw *hw, bool dl_finished) 
		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

		RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD,

			 ("Set RSVD page location to Fw.\n"));

			 ("Set RSVD page location to Fw.\n"));

		RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,

		RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_DMESG,

				"H2C_RSVDPAGE:\n",

			      "H2C_RSVDPAGE", u1RsvdPageLoc, 3);

				u1RsvdPageLoc, 3);

		rtl92c_fill_h2c_cmd(hw, H2C_RSVDPAGE,

		rtl92c_fill_h2c_cmd(hw, H2C_RSVDPAGE,

				    sizeof(u1RsvdPageLoc), u1RsvdPageLoc);

				    sizeof(u1RsvdPageLoc), u1RsvdPageLoc);

	} else

	} else

drivers/net/wireless/rtlwifi/rtl8192ce/hw.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -1570,7 +1570,7 @@ static void _rtl92ce_read_adapter_info(struct ieee80211_hw *hw) 
			 ("RTL819X Not boot from eeprom, check it !!"));

			 ("RTL819X Not boot from eeprom, check it !!"));

	}

	}





	RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, ("MAP\n"),

	RT_PRINT_DATA(rtlpriv, COMP_INIT, DBG_DMESG, "MAP",

		      hwinfo, HWSET_MAX_SIZE);

		      hwinfo, HWSET_MAX_SIZE);





	eeprom_id = *((u16 *)&hwinfo[0]);

	eeprom_id = *((u16 *)&hwinfo[0]);
@@ -2134,7 +2134,7 @@ void rtl92ce_set_key(struct ieee80211_hw *hw, u32 key_index, 
				 ("add one entry\n"));

				 ("add one entry\n"));

			if (is_pairwise) {

			if (is_pairwise) {

				RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_LOUD,

				RT_PRINT_DATA(rtlpriv, COMP_SEC, DBG_LOUD,

					      "Pairwiase Key content :",

					      "Pairwise Key content",

					      rtlpriv->sec.pairwise_key,

					      rtlpriv->sec.pairwise_key,

					      rtlpriv->sec.

					      rtlpriv->sec.

					      key_len[PAIRWISE_KEYIDX]);

					      key_len[PAIRWISE_KEYIDX]);

drivers/net/wireless/rtlwifi/rtl8192ce/trx.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -821,8 +821,7 @@ void rtl92ce_tx_fill_cmddesc(struct ieee80211_hw *hw, 
	}

	}





	RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,

	RT_PRINT_DATA(rtlpriv, COMP_CMD, DBG_LOUD,

		      "H2C Tx Cmd Content\n",

		      "H2C Tx Cmd Content", pdesc, TX_DESC_SIZE);

		      pdesc, TX_DESC_SIZE);

}

}





void rtl92ce_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)

void rtl92ce_set_desc(u8 *pdesc, bool istx, u8 desc_name, u8 *val)