Skip to contentSkip to conversation

rtlwifi: rtl_pci: Fix errors when CONFIG_RTLWIFI_DEBUG is not set

PATCH In review Larry Finger 2 participants 3 messages Sep 20, 2019 – Sep 21, 2019 Realtek wireless driver (rtlwifi family)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rtlwifi: rtl_pci: Fix errors when CONFIG_RTLWIFI_DEBUG is not set

When rtlwifi debugging is disabled, missing globals occur due to the attempt execution of code that is never generated.

---
 drivers/net/wireless/realtek/rtlwifi/pci.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/net/wireless/realtek/rtlwifi/pci.c +4 -0
index 6087ec7a90a6..2f8aad28f1c0 100644
@@ -2298,8 +2298,10 @@ int rtl_pci_probe(struct pci_dev *pdev,
 	}
 	rtlpriv->mac80211.mac80211_registered = 1;
 
+#ifdef CONFIG_RTLWIFI_DEBUG
 	/* add for debug */
 	rtl_debug_add_one(hw);
+#endif
 
 	/*init rfkill */
 	rtl_init_rfkill(hw);	/* Init PCI sw */
@@ -2349,8 +2351,10 @@ void rtl_pci_disconnect(struct pci_dev *pdev)
 	wait_for_completion(&rtlpriv->firmware_loading_complete);
 	clear_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
 
+#ifdef CONFIG_RTLWIFI_DEBUG
 	/* remove form debug */
 	rtl_debug_remove_one(hw);
+#endif
 
 	/*ieee80211_unregister_hw will call ops_stop */
 	if (rtlmac->mac80211_registered == 1) {
Signature · 1 line
2.23.0
#1 lore raw
Quoted 4 lines · Larry Finger

When rtlwifi debugging is disabled, missing globals occur due to the attempt execution of code that is never generated.

Is this is a new regression or an old problem?

Signature · 1 line
Kalle Valo
#2 lore raw
In reply to Larry Finger
Quoted 2 lines · Larry Finger

When rtlwifi debugging is disabled, missing globals occur due to the attempt execution of code that is never generated.

Do you have the exact error message? I don't know why this is failing.

Quoted 21 lines
---
 drivers/net/wireless/realtek/rtlwifi/pci.c | 4 ++++
 1 file changed, 4 insertions(+)
drivers/net/wireless/realtek/rtlwifi/pci.c +2 -0
index 6087ec7a90a6..2f8aad28f1c0 100644
@@ -2298,8 +2298,10 @@ int rtl_pci_probe(struct pci_dev *pdev,
 	}
 	rtlpriv->mac80211.mac80211_registered = 1;
 
+#ifdef CONFIG_RTLWIFI_DEBUG
 	/* add for debug */
 	rtl_debug_add_one(hw);
+#endif
 
 	/*init rfkill */
 	rtl_init_rfkill(hw);	/* Init PCI sw */

drivers/net/wireless/realtek/rtlwifi/pci.c void rtl_pci_disconnect(struct pci_dev *pdev) · line 2357

Quoted 7 lines
drivers/net/wireless/realtek/rtlwifi/pci.c +2 -0
@@ -2349,8 +2351,10 @@ void rtl_pci_disconnect(struct pci_dev *pdev)
 	wait_for_completion(&rtlpriv->firmware_loading_complete);
 	clear_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);
 
+#ifdef CONFIG_RTLWIFI_DEBUG
 	/* remove form debug */
 	rtl_debug_remove_one(hw);
+#endif

Then I checked debug.h I see that it's supposed to be handled already:

#ifdef CONFIG_RTLWIFI_DEBUG
void rtl_debug_add_one(struct ieee80211_hw *hw); void rtl_debug_remove_one(struct ieee80211_hw *hw); void rtl_debugfs_add_topdir(void);
void rtl_debugfs_remove_topdir(void);
#else
#define rtl_debug_add_one(hw)
#define rtl_debug_remove_one(hw)
#define rtl_debugfs_add_topdir()
#define rtl_debugfs_remove_topdir()
#endif

But the else part looks weird, I'm used to using inline functions instead of defines:

static inline void rtl_debug_add_one(struct ieee80211_hw *hw) {} static inline void rtl_debug_remove_one(struct ieee80211_hw *hw) {} static inline void rtl_debugfs_add_topdir(void) {} static inline void rtl_debugfs_remove_topdir(void) {}

Inline functions also make it possible for the compiler to check the types are correct.

Signature · 1 line
Kalle Valo