All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 12/19] rtlwifi: fix %d confusingly prefixed with 0x in format strings
@ 2014-08-04  0:20 Hans Wennborg
  2014-08-25 20:12 ` John W. Linville
  0 siblings, 1 reply; 3+ messages in thread
From: Hans Wennborg @ 2014-08-04  0:20 UTC (permalink / raw)
  To: Larry.Finger, linux-wireless, linux-kernel; +Cc: Hans Wennborg

Signed-off-by: Hans Wennborg <hans@hanshq.net>
---
 drivers/net/wireless/rtlwifi/pci.c           | 6 +++---
 drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 67d1ee6..74a8ba4 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -646,7 +646,7 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
 				== 2) {
 
 			RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
-				 "more desc left, wake skb_queue@%d, ring->idx = %d, skb_queue_len = 0x%d\n",
+				 "more desc left, wake skb_queue@%d, ring->idx = %d, skb_queue_len = 0x%x\n",
 				 prio, ring->idx,
 				 skb_queue_len(&ring->queue));
 
@@ -1469,7 +1469,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw,
 
 		if ((own == 1) && (hw_queue != BEACON_QUEUE)) {
 			RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-				 "No more TX desc@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%d\n",
+				 "No more TX desc@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%x\n",
 				 hw_queue, ring->idx, idx,
 				 skb_queue_len(&ring->queue));
 
@@ -1511,7 +1511,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw,
 	if ((ring->entries - skb_queue_len(&ring->queue)) < 2 &&
 	    hw_queue != BEACON_QUEUE) {
 		RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
-			 "less desc left, stop skb_queue@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%d\n",
+			 "less desc left, stop skb_queue@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%x\n",
 			 hw_queue, ring->idx, idx,
 			 skb_queue_len(&ring->queue));
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
index 592125a..7cfdfc9 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
@@ -677,7 +677,7 @@ static void _rtl92d_store_pwrindex_diffrate_offset(struct ieee80211_hw *hw,
 
 	rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][index] = data;
 	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-		 "MCSTxPowerLevelOriginalOffset[%d][%d] = 0x%ulx\n",
+		 "MCSTxPowerLevelOriginalOffset[%d][%d] = 0x%lx\n",
 		 rtlphy->pwrgroup_cnt, index,
 		 rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][index]);
 	if (index == 13)
@@ -2531,7 +2531,7 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw,
 	if (rtlpriv->rtlhal.current_bandtype == BAND_ON_5G) {/* Path-A for 5G */
 		u4tmp = curveindex_5g[channel-1];
 		RTPRINT(rtlpriv, FINIT, INIT_IQK,
-			"ver 1 set RF-A, 5G,	0x28 = 0x%ulx !!\n", u4tmp);
+			"ver 1 set RF-A, 5G,	0x28 = 0x%lx !!\n", u4tmp);
 		if (rtlpriv->rtlhal.macphymode == DUALMAC_DUALPHY &&
 			rtlpriv->rtlhal.interfaceindex == 1) {
 			bneed_powerdown_radio =
@@ -2550,7 +2550,7 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw,
 	} else if (rtlpriv->rtlhal.current_bandtype == BAND_ON_2_4G) {
 		u4tmp = curveindex_2g[channel-1];
 		RTPRINT(rtlpriv, FINIT, INIT_IQK,
-			"ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n", u4tmp);
+			"ver 3 set RF-B, 2G, 0x28 = 0x%lx !!\n", u4tmp);
 		if (rtlpriv->rtlhal.macphymode == DUALMAC_DUALPHY &&
 			rtlpriv->rtlhal.interfaceindex == 0) {
 			bneed_powerdown_radio =
@@ -2562,7 +2562,7 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw,
 		}
 		rtl_set_rfreg(hw, erfpath, RF_SYN_G4, 0x3f800, u4tmp);
 		RTPRINT(rtlpriv, FINIT, INIT_IQK,
-			"ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n",
+			"ver 3 set RF-B, 2G, 0x28 = 0x%lx !!\n",
 			rtl_get_rfreg(hw,  erfpath, RF_SYN_G4, 0x3f800));
 		if (bneed_powerdown_radio)
 			_rtl92d_phy_restore_rf_env(hw, erfpath, &u4regvalue);
-- 
2.0.0.526.g5318336


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH 12/19] rtlwifi: fix %d confusingly prefixed with 0x in format strings
  2014-08-04  0:20 [PATCH 12/19] rtlwifi: fix %d confusingly prefixed with 0x in format strings Hans Wennborg
@ 2014-08-25 20:12 ` John W. Linville
  2014-09-06  3:19   ` [PATCH 1/1] " Hans Wennborg
  0 siblings, 1 reply; 3+ messages in thread
From: John W. Linville @ 2014-08-25 20:12 UTC (permalink / raw)
  To: Hans Wennborg; +Cc: Larry.Finger, linux-wireless, linux-kernel

  CC      drivers/net/wireless/rtlwifi/rtl8192de/phy.o
drivers/net/wireless/rtlwifi/rtl8192de/phy.c: In function ‘_rtl92d_store_pwrindex_diffrate_offset’:
drivers/net/wireless/rtlwifi/rtl8192de/phy.c:679:2: warning: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 7 has type ‘u32’ [-Wformat=]
  RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
  ^
drivers/net/wireless/rtlwifi/rtl8192de/phy.c: In function ‘_rtl92d_phy_reload_lck_setting’:
drivers/net/wireless/rtlwifi/rtl8192de/phy.c:2533:3: warning: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘u32’ [-Wformat=]
   RTPRINT(rtlpriv, FINIT, INIT_IQK,
   ^
drivers/net/wireless/rtlwifi/rtl8192de/phy.c:2552:3: warning: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘u32’ [-Wformat=]
   RTPRINT(rtlpriv, FINIT, INIT_IQK,
   ^
drivers/net/wireless/rtlwifi/rtl8192de/phy.c:2564:3: warning: format ‘%lx’ expects argument of type ‘long unsigned int’, but argument 2 has type ‘u32’ [-Wformat=]
   RTPRINT(rtlpriv, FINIT, INIT_IQK,
   ^

On Sun, Aug 03, 2014 at 05:20:16PM -0700, Hans Wennborg wrote:
> Signed-off-by: Hans Wennborg <hans@hanshq.net>
> ---
>  drivers/net/wireless/rtlwifi/pci.c           | 6 +++---
>  drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 8 ++++----
>  2 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
> index 67d1ee6..74a8ba4 100644
> --- a/drivers/net/wireless/rtlwifi/pci.c
> +++ b/drivers/net/wireless/rtlwifi/pci.c
> @@ -646,7 +646,7 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
>  				== 2) {
>  
>  			RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
> -				 "more desc left, wake skb_queue@%d, ring->idx = %d, skb_queue_len = 0x%d\n",
> +				 "more desc left, wake skb_queue@%d, ring->idx = %d, skb_queue_len = 0x%x\n",
>  				 prio, ring->idx,
>  				 skb_queue_len(&ring->queue));
>  
> @@ -1469,7 +1469,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw,
>  
>  		if ((own == 1) && (hw_queue != BEACON_QUEUE)) {
>  			RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
> -				 "No more TX desc@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%d\n",
> +				 "No more TX desc@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%x\n",
>  				 hw_queue, ring->idx, idx,
>  				 skb_queue_len(&ring->queue));
>  
> @@ -1511,7 +1511,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw,
>  	if ((ring->entries - skb_queue_len(&ring->queue)) < 2 &&
>  	    hw_queue != BEACON_QUEUE) {
>  		RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
> -			 "less desc left, stop skb_queue@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%d\n",
> +			 "less desc left, stop skb_queue@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%x\n",
>  			 hw_queue, ring->idx, idx,
>  			 skb_queue_len(&ring->queue));
>  
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
> index 592125a..7cfdfc9 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
> @@ -677,7 +677,7 @@ static void _rtl92d_store_pwrindex_diffrate_offset(struct ieee80211_hw *hw,
>  
>  	rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][index] = data;
>  	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
> -		 "MCSTxPowerLevelOriginalOffset[%d][%d] = 0x%ulx\n",
> +		 "MCSTxPowerLevelOriginalOffset[%d][%d] = 0x%lx\n",
>  		 rtlphy->pwrgroup_cnt, index,
>  		 rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][index]);
>  	if (index == 13)
> @@ -2531,7 +2531,7 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw,
>  	if (rtlpriv->rtlhal.current_bandtype == BAND_ON_5G) {/* Path-A for 5G */
>  		u4tmp = curveindex_5g[channel-1];
>  		RTPRINT(rtlpriv, FINIT, INIT_IQK,
> -			"ver 1 set RF-A, 5G,	0x28 = 0x%ulx !!\n", u4tmp);
> +			"ver 1 set RF-A, 5G,	0x28 = 0x%lx !!\n", u4tmp);
>  		if (rtlpriv->rtlhal.macphymode == DUALMAC_DUALPHY &&
>  			rtlpriv->rtlhal.interfaceindex == 1) {
>  			bneed_powerdown_radio =
> @@ -2550,7 +2550,7 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw,
>  	} else if (rtlpriv->rtlhal.current_bandtype == BAND_ON_2_4G) {
>  		u4tmp = curveindex_2g[channel-1];
>  		RTPRINT(rtlpriv, FINIT, INIT_IQK,
> -			"ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n", u4tmp);
> +			"ver 3 set RF-B, 2G, 0x28 = 0x%lx !!\n", u4tmp);
>  		if (rtlpriv->rtlhal.macphymode == DUALMAC_DUALPHY &&
>  			rtlpriv->rtlhal.interfaceindex == 0) {
>  			bneed_powerdown_radio =
> @@ -2562,7 +2562,7 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw,
>  		}
>  		rtl_set_rfreg(hw, erfpath, RF_SYN_G4, 0x3f800, u4tmp);
>  		RTPRINT(rtlpriv, FINIT, INIT_IQK,
> -			"ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n",
> +			"ver 3 set RF-B, 2G, 0x28 = 0x%lx !!\n",
>  			rtl_get_rfreg(hw,  erfpath, RF_SYN_G4, 0x3f800));
>  		if (bneed_powerdown_radio)
>  			_rtl92d_phy_restore_rf_env(hw, erfpath, &u4regvalue);
> -- 
> 2.0.0.526.g5318336
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 

-- 
John W. Linville		Someday the world will need a hero, and you
linville@tuxdriver.com			might be all we have.  Be ready.

^ permalink raw reply	[flat|nested] 3+ messages in thread
* [PATCH 1/1] rtlwifi: fix %d confusingly prefixed with 0x in format strings
  2014-08-25 20:12 ` John W. Linville
@ 2014-09-06  3:19   ` Hans Wennborg
  0 siblings, 0 replies; 3+ messages in thread
From: Hans Wennborg @ 2014-09-06  3:19 UTC (permalink / raw)
  To: linville, larry.finger, linux-wireless, linux-kernel; +Cc: Hans Wennborg

Signed-off-by: Hans Wennborg <hans@hanshq.net>
---
 drivers/net/wireless/rtlwifi/pci.c           | 6 +++---
 drivers/net/wireless/rtlwifi/rtl8192de/phy.c | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c
index 67d1ee6..74a8ba4 100644
--- a/drivers/net/wireless/rtlwifi/pci.c
+++ b/drivers/net/wireless/rtlwifi/pci.c
@@ -646,7 +646,7 @@ static void _rtl_pci_tx_isr(struct ieee80211_hw *hw, int prio)
 				== 2) {
 
 			RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
-				 "more desc left, wake skb_queue@%d, ring->idx = %d, skb_queue_len = 0x%d\n",
+				 "more desc left, wake skb_queue@%d, ring->idx = %d, skb_queue_len = 0x%x\n",
 				 prio, ring->idx,
 				 skb_queue_len(&ring->queue));
 
@@ -1469,7 +1469,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw,
 
 		if ((own == 1) && (hw_queue != BEACON_QUEUE)) {
 			RT_TRACE(rtlpriv, COMP_ERR, DBG_WARNING,
-				 "No more TX desc@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%d\n",
+				 "No more TX desc@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%x\n",
 				 hw_queue, ring->idx, idx,
 				 skb_queue_len(&ring->queue));
 
@@ -1511,7 +1511,7 @@ static int rtl_pci_tx(struct ieee80211_hw *hw,
 	if ((ring->entries - skb_queue_len(&ring->queue)) < 2 &&
 	    hw_queue != BEACON_QUEUE) {
 		RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
-			 "less desc left, stop skb_queue@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%d\n",
+			 "less desc left, stop skb_queue@%d, ring->idx = %d, idx = %d, skb_queue_len = 0x%x\n",
 			 hw_queue, ring->idx, idx,
 			 skb_queue_len(&ring->queue));
 
diff --git a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
index 592125a..1961b8e 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192de/phy.c
@@ -677,7 +677,7 @@ static void _rtl92d_store_pwrindex_diffrate_offset(struct ieee80211_hw *hw,
 
 	rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][index] = data;
 	RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE,
-		 "MCSTxPowerLevelOriginalOffset[%d][%d] = 0x%ulx\n",
+		 "MCSTxPowerLevelOriginalOffset[%d][%d] = 0x%x\n",
 		 rtlphy->pwrgroup_cnt, index,
 		 rtlphy->mcs_offset[rtlphy->pwrgroup_cnt][index]);
 	if (index == 13)
@@ -2531,7 +2531,7 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw,
 	if (rtlpriv->rtlhal.current_bandtype == BAND_ON_5G) {/* Path-A for 5G */
 		u4tmp = curveindex_5g[channel-1];
 		RTPRINT(rtlpriv, FINIT, INIT_IQK,
-			"ver 1 set RF-A, 5G,	0x28 = 0x%ulx !!\n", u4tmp);
+			"ver 1 set RF-A, 5G,	0x28 = 0x%x !!\n", u4tmp);
 		if (rtlpriv->rtlhal.macphymode == DUALMAC_DUALPHY &&
 			rtlpriv->rtlhal.interfaceindex == 1) {
 			bneed_powerdown_radio =
@@ -2550,7 +2550,7 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw,
 	} else if (rtlpriv->rtlhal.current_bandtype == BAND_ON_2_4G) {
 		u4tmp = curveindex_2g[channel-1];
 		RTPRINT(rtlpriv, FINIT, INIT_IQK,
-			"ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n", u4tmp);
+			"ver 3 set RF-B, 2G, 0x28 = 0x%x !!\n", u4tmp);
 		if (rtlpriv->rtlhal.macphymode == DUALMAC_DUALPHY &&
 			rtlpriv->rtlhal.interfaceindex == 0) {
 			bneed_powerdown_radio =
@@ -2562,7 +2562,7 @@ static void _rtl92d_phy_reload_lck_setting(struct ieee80211_hw *hw,
 		}
 		rtl_set_rfreg(hw, erfpath, RF_SYN_G4, 0x3f800, u4tmp);
 		RTPRINT(rtlpriv, FINIT, INIT_IQK,
-			"ver 3 set RF-B, 2G, 0x28 = 0x%ulx !!\n",
+			"ver 3 set RF-B, 2G, 0x28 = 0x%x !!\n",
 			rtl_get_rfreg(hw,  erfpath, RF_SYN_G4, 0x3f800));
 		if (bneed_powerdown_radio)
 			_rtl92d_phy_restore_rf_env(hw, erfpath, &u4regvalue);
-- 
2.1.0.rc2.206.gedb03e5


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-06  3:20 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-04  0:20 [PATCH 12/19] rtlwifi: fix %d confusingly prefixed with 0x in format strings Hans Wennborg
2014-08-25 20:12 ` John W. Linville
2014-09-06  3:19   ` [PATCH 1/1] " Hans Wennborg

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.