From patchwork Thu Jan 19 17:25:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9526561 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 014C560459 for ; Thu, 19 Jan 2017 17:50:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E78C82853E for ; Thu, 19 Jan 2017 17:50:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DC469285C3; Thu, 19 Jan 2017 17:50:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A12A285FC for ; Thu, 19 Jan 2017 17:50:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753982AbdASRum (ORCPT ); Thu, 19 Jan 2017 12:50:42 -0500 Received: from mail-oi0-f66.google.com ([209.85.218.66]:32854 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753812AbdASRuk (ORCPT ); Thu, 19 Jan 2017 12:50:40 -0500 Received: by mail-oi0-f66.google.com with SMTP id j15so3769435oih.0 for ; Thu, 19 Jan 2017 09:50:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=g1qXLRaKTCJfkFd2l8ACHit3r2OnCy9Ah03ZV8jBDtg=; b=aS8DCwQtwTjMOgqnIVfXUoRq5nB23BwH8TqcZPgqko3pjr86ZATVE1/DV0FW4UCl91 C+sFnqeBw6nsY9GQwBySrnWrbL0ZlFqH7gX7UWPieolA/6ecTHqKUfRLTCv73Ccclr7E Zid6eDZlWA6yTcK8fJCCjTu1kwF/N4p9ccMhFU/KVWFlejN1gDlPnxN/oDoRXv6iZF5N VbH3nNiX+GyQsFthPPpbvvHPdb2yNIKCelVDMPP7fFPBhs3cXlWhHnGdtg1d+olOMMV/ hudFy+BtvBpO63OMDu1jXl09hOW0ZwA+MClI+rUPqj8qNBGu8Tuk9YUWIQCoyK3+pR4m LrDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=g1qXLRaKTCJfkFd2l8ACHit3r2OnCy9Ah03ZV8jBDtg=; b=fCpvF0MD12eOs2IyL2/Ty4YMLy34bRqKEOUNmcDrnyHX6uTJV8JeasEOCI2g1iE9r8 so0G1AoihqcAzaNGu9rnY8IryMXRxgTSQvJlOZCjbVwFN6pPNPs5PSGkF5ySD6mkpZYj x4R8cfk0YroRa5CgM+swMniGUKOilISB2fTfvufdcjx2rg24kReC4qAcdkbfZDLtIYXE wKgRHJ7P0FTnmGKv+og9RJibGI/jK5PcP3s54II49W9DwLLbtbLJ1sCOH8VT79W7bZlh XXw9ozfPvRGUc1/9HP1opPfYYzcsAbSfJaI92W8N2G60Vc14oy4vfU7EEK/eXDKDfP6m khaA== X-Gm-Message-State: AIkVDXKXbEvWnXjh314dtJmFnc1ftVXxaXqYMnhtOzG8cM089rX0og4btL2LviiUU9IwHQ== X-Received: by 10.202.94.194 with SMTP id s185mr5145488oib.196.1484846730469; Thu, 19 Jan 2017 09:25:30 -0800 (PST) Received: from linux-4v1g.suse (cpe-24-31-249-175.kc.res.rr.com. [24.31.249.175]) by smtp.gmail.com with ESMTPSA id s56sm2247907otd.25.2017.01.19.09.25.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Jan 2017 09:25:30 -0800 (PST) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, Larry Finger , Ping-Ke Shih Subject: [PATCH v2 3/3] rtlwifi: Remove debugging entry in sysfs Date: Thu, 19 Jan 2017 11:25:21 -0600 Message-Id: <20170119172521.32643-4-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170119172521.32643-1-Larry.Finger@lwfinger.net> References: <20170119172521.32643-1-Larry.Finger@lwfinger.net> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP As the kernel provides access to module parameters through entries in /sys/module//parameters/, there is no need for a private interface. Thus the existing code for setting the debug level is removed. Reported-by: Kalle Valo Signed-off-by: Larry Finger Cc: Ping-Ke Shih --- V2 - Switched the dynamic debug entries from a private sysfs entry --- drivers/net/wireless/realtek/rtlwifi/base.c | 59 ----------------------------- drivers/net/wireless/realtek/rtlwifi/base.h | 1 - drivers/net/wireless/realtek/rtlwifi/pci.c | 8 ---- 3 files changed, 68 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c index 1b23b24..01cf0a9 100644 --- a/drivers/net/wireless/realtek/rtlwifi/base.c +++ b/drivers/net/wireless/realtek/rtlwifi/base.c @@ -2083,65 +2083,6 @@ void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len) } 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 "); MODULE_AUTHOR("Realtek WlanFAE "); MODULE_AUTHOR("Larry Finger "); diff --git a/drivers/net/wireless/realtek/rtlwifi/base.h b/drivers/net/wireless/realtek/rtlwifi/base.h index 74233d6..6c770aec 100644 --- a/drivers/net/wireless/realtek/rtlwifi/base.h +++ b/drivers/net/wireless/realtek/rtlwifi/base.h @@ -148,7 +148,6 @@ int rtl_send_smps_action(struct ieee80211_hw *hw, u8 *rtl_find_ie(u8 *data, unsigned int len, u8 ie); void rtl_recognize_peer(struct ieee80211_hw *hw, u8 *data, unsigned int len); u8 rtl_tid_to_ac(u8 tid); -extern struct attribute_group rtl_attribute_group; void rtl_easy_concurrent_retrytimer_callback(unsigned long data); extern struct rtl_global_var rtl_global_var; void rtl_phy_scan_operation_backup(struct ieee80211_hw *hw, u8 operation); diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c index f6d4dbe..b402f43 100644 --- a/drivers/net/wireless/realtek/rtlwifi/pci.c +++ b/drivers/net/wireless/realtek/rtlwifi/pci.c @@ -2289,12 +2289,6 @@ int rtl_pci_probe(struct pci_dev *pdev, } 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 */ 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); clear_bit(RTL_STATUS_INTERFACE_START, &rtlpriv->status); - sysfs_remove_group(&pdev->dev.kobj, &rtl_attribute_group); - /*ieee80211_unregister_hw will call ops_stop */ if (rtlmac->mac80211_registered == 1) { ieee80211_unregister_hw(hw);