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

Commit 9336d376 authored by Larry Finger's avatar Larry Finger Committed by Kalle Valo
Browse files

rtlwifi: Remove debugging entry in sysfs 



As the kernel provides access to module parameters through entries in
/sys/module/<driver>/parameters/, there is no need for a private
interface. Thus the existing code for setting the debug level is
removed.

Reported-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent c34df318

drivers/net/wireless/realtek/rtlwifi/base.c

+0 −59
Original line number Original line Diff line number Diff line
@@ -2083,65 +2083,6 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len) 
}

}

EXPORT_SYMBOL_GPL(rtl_recognize_peer);

EXPORT_SYMBOL_GPL(rtl_recognize_peer);





/*********************************************************

 *

 * sysfs functions

 *

 *********************************************************/

static ssize_t rtl_show_debug_level(struct device *d,

				    struct device_attribute *attr, char *buf)

{

	struct ieee80211_hw *hw = dev_get_drvdata(d);

	struct rtl_priv *rtlpriv = rtl_priv(hw);



	return sprintf(buf, "0x%08X\n", rtlpriv->cfg->mod_params->debug_level);

}



static ssize_t rtl_store_debug_level(struct device *d,

				     struct device_attribute *attr,

				     const char *buf, size_t count)

{

	struct ieee80211_hw *hw = dev_get_drvdata(d);

	struct rtl_priv *rtlpriv = rtl_priv(hw);

	unsigned long val;

	int ret;



	ret = kstrtoul(buf, 0, &val);

	if (ret) {

		RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,

			 "%s is not in hex or decimal form.\n", buf);

	} else {

		rtlpriv->cfg->mod_params->debug_level = val;

		RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,

			 "debuglevel:%x\n",

			 rtlpriv->cfg->mod_params->debug_level);

	}



	return strnlen(buf, count);

}



static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO,

		   rtl_show_debug_level, rtl_store_debug_level);



static struct attribute *rtl_sysfs_entries[] = {



	&dev_attr_debug_level.attr,



	NULL

};



/*

 * "name" is folder name witch will be

 * put in device directory like :

 * sys/devices/pci0000:00/0000:00:1c.4/

 * 0000:06:00.0/rtl_sysfs

 */

struct attribute_group rtl_attribute_group = {

	.name = "rtlsysfs",

	.attrs = rtl_sysfs_entries,

};

EXPORT_SYMBOL_GPL(rtl_attribute_group);



MODULE_AUTHOR("lizhaoming	<chaoming_li@realsil.com.cn>");

MODULE_AUTHOR("lizhaoming	<chaoming_li@realsil.com.cn>");

MODULE_AUTHOR("Realtek WlanFAE	<wlanfae@realtek.com>");

MODULE_AUTHOR("Realtek WlanFAE	<wlanfae@realtek.com>");

MODULE_AUTHOR("Larry Finger	<Larry.FInger@lwfinger.net>");

MODULE_AUTHOR("Larry Finger	<Larry.FInger@lwfinger.net>");

drivers/net/wireless/realtek/rtlwifi/base.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -148,7 +148,6 @@ int rtl_send_smps_action(struct ieee80211_hw *hw, 
u8 *rtl_find_ie(u8 *data, unsigned int len, u8 ie);

u8 *rtl_find_ie(u8 *data, unsigned int len, u8 ie);

void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len);

void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len);

u8 rtl_tid_to_ac(u8 tid);

u8 rtl_tid_to_ac(u8 tid);

extern struct attribute_group rtl_attribute_group;

void rtl_easy_concurrent_retrytimer_callback(unsigned long data);

void rtl_easy_concurrent_retrytimer_callback(unsigned long data);

extern struct rtl_global_var rtl_global_var;

extern struct rtl_global_var rtl_global_var;

void rtl_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation);

void rtl_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation);

drivers/net/wireless/realtek/rtlwifi/pci.c

+0 −8
Original line number Original line Diff line number Diff line
@@ -2289,12 +2289,6 @@ int rtl_pci_probe(struct pci_dev *pdev, 
	}

	}

	rtlpriv->mac80211.mac80211_registered = 1;

	rtlpriv->mac80211.mac80211_registered = 1;





	err = sysfs_create_group(&pdev->dev.kobj, &rtl_attribute_group);

	if (err) {

		pr_err("failed to create sysfs device attributes\n");

		goto fail3;

	}



	/*init rfkill */

	/*init rfkill */

	rtl_init_rfkill(hw);	/* Init PCI sw */

	rtl_init_rfkill(hw);	/* Init PCI sw */
@@ -2344,8 +2338,6 @@ void rtl_pci_disconnect(struct pci_dev *pdev) 
	wait_for_completion(&rtlpriv->firmware_loading_complete);

	wait_for_completion(&rtlpriv->firmware_loading_complete);

	clear_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);

	clear_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status);





	sysfs_remove_group(&pdev->dev.kobj, &rtl_attribute_group);



	/*ieee80211_unregister_hw will call ops_stop */

	/*ieee80211_unregister_hw will call ops_stop */

	if (rtlmac->mac80211_registered == 1) {

	if (rtlmac->mac80211_registered == 1) {

		ieee80211_unregister_hw(hw);

		ieee80211_unregister_hw(hw);