From patchwork Fri Apr 22 08:08:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernard Zhao X-Patchwork-Id: 565216 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4D8BC433EF for ; Fri, 22 Apr 2022 08:09:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1445489AbiDVIMR (ORCPT ); Fri, 22 Apr 2022 04:12:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52448 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1380772AbiDVIMQ (ORCPT ); Fri, 22 Apr 2022 04:12:16 -0400 Received: from m15111.mail.126.com (m15111.mail.126.com [220.181.15.111]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 6C45952E45; Fri, 22 Apr 2022 01:09:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-Id:MIME-Version; bh=P9Al3 tNq9A6MMeOWm1tBjYMEjQXzg/zzljHAbch3uHE=; b=exjIFcmCrLsMuwFfGTt9Q kqgmOWPJhpQ78BytXMC3CG9OY89HALmf9gZArLHuwa6aEjxAbJQVjrucwkGtNXoV Ohlrp7saaaGgkiiTqXl120CiG0WfCdbAlor/3DjMA0a8vdHU8+4uCSMer2FjrAnB Xrx4LbHTV+1QoAW4mWB1zI= Received: from ubuntu.localdomain (unknown [58.213.83.157]) by smtp1 (Coremail) with SMTP id C8mowAA3n9+aYmJic1AdBA--.42425S4; Fri, 22 Apr 2022 16:08:59 +0800 (CST) From: Bernard Zhao To: Jakub Kicinski , Kalle Valo , "David S. Miller" , Paolo Abeni , Matthias Brugger , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Cc: bernard@vivo.com, Bernard Zhao Subject: [PATCH v2] mediatek/mt7601u: add debugfs exit function Date: Fri, 22 Apr 2022 01:08:54 -0700 Message-Id: <20220422080854.490379-1-zhaojunkui2008@126.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 X-CM-TRANSID: C8mowAA3n9+aYmJic1AdBA--.42425S4 X-Coremail-Antispam: 1Uf129KBjvJXoWxCr1xWF18Ar45GFy8KFWruFg_yoWrXrWUpa yDKa4Ykw18Zr15G3yfCF1UZryrGas3Wr17JF95Z345Z3y8Ar1Fq3WjqFy7ZasxXFZ8A3Wj qF45tF47GryI9FJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x0zikR67UUUUU= X-Originating-IP: [58.213.83.157] X-CM-SenderInfo: p2kd0y5xqn3xasqqmqqrswhudrp/1tbiuQPqqlpD8lH33AACsp Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org When mt7601u loaded, there are two cases: First when mt7601u is loaded, in function mt7601u_probe, if function mt7601u_probe run into error lable err_hw, mt7601u_cleanup didn`t cleanup the debugfs node. Second when the module disconnect, in function mt7601u_disconnect, mt7601u_cleanup didn`t cleanup the debugfs node. This patch add debugfs exit function and try to cleanup debugfs node when mt7601u loaded fail or unloaded. Signed-off-by: Bernard Zhao Changes since V1: *Remove CONFIG_DEBUG_FS check. --- .../net/wireless/mediatek/mt7601u/debugfs.c | 23 +++++++++++-------- drivers/net/wireless/mediatek/mt7601u/init.c | 1 + .../net/wireless/mediatek/mt7601u/mt7601u.h | 3 +++ 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/drivers/net/wireless/mediatek/mt7601u/debugfs.c b/drivers/net/wireless/mediatek/mt7601u/debugfs.c index 20669eacb66e..efc575a1147c 100644 --- a/drivers/net/wireless/mediatek/mt7601u/debugfs.c +++ b/drivers/net/wireless/mediatek/mt7601u/debugfs.c @@ -124,17 +124,20 @@ DEFINE_SHOW_ATTRIBUTE(mt7601u_eeprom_param); void mt7601u_init_debugfs(struct mt7601u_dev *dev) { - struct dentry *dir; - - dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir); - if (!dir) + dev->root_dir = debugfs_create_dir("mt7601u", dev->hw->wiphy->debugfsdir); + if (!dev->root_dir) return; - debugfs_create_u8("temperature", 0400, dir, &dev->raw_temp); - debugfs_create_u32("temp_mode", 0400, dir, &dev->temp_mode); + debugfs_create_u8("temperature", 0400, dev->root_dir, &dev->raw_temp); + debugfs_create_u32("temp_mode", 0400, dev->root_dir, &dev->temp_mode); + + debugfs_create_u32("regidx", 0600, dev->root_dir, &dev->debugfs_reg); + debugfs_create_file("regval", 0600, dev->root_dir, dev, &fops_regval); + debugfs_create_file("ampdu_stat", 0400, dev->root_dir, dev, &mt7601u_ampdu_stat_fops); + debugfs_create_file("eeprom_param", 0400, dev->root_dir, dev, &mt7601u_eeprom_param_fops); +} - debugfs_create_u32("regidx", 0600, dir, &dev->debugfs_reg); - debugfs_create_file("regval", 0600, dir, dev, &fops_regval); - debugfs_create_file("ampdu_stat", 0400, dir, dev, &mt7601u_ampdu_stat_fops); - debugfs_create_file("eeprom_param", 0400, dir, dev, &mt7601u_eeprom_param_fops); +void mt7601u_exit_debugfs(struct mt7601u_dev *dev) +{ + debugfs_remove(dev->root_dir); } diff --git a/drivers/net/wireless/mediatek/mt7601u/init.c b/drivers/net/wireless/mediatek/mt7601u/init.c index 5d9e952b2966..eacdd5785fa6 100644 --- a/drivers/net/wireless/mediatek/mt7601u/init.c +++ b/drivers/net/wireless/mediatek/mt7601u/init.c @@ -427,6 +427,7 @@ void mt7601u_cleanup(struct mt7601u_dev *dev) mt7601u_stop_hardware(dev); mt7601u_dma_cleanup(dev); mt7601u_mcu_cmd_deinit(dev); + mt7601u_exit_debugfs(dev); } struct mt7601u_dev *mt7601u_alloc_device(struct device *pdev) diff --git a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h index a122f1dd38f6..06c190a3f54c 100644 --- a/drivers/net/wireless/mediatek/mt7601u/mt7601u.h +++ b/drivers/net/wireless/mediatek/mt7601u/mt7601u.h @@ -242,6 +242,8 @@ struct mt7601u_dev { u32 rf_pa_mode[2]; struct mac_stats stats; + + struct dentry *root_dir; }; struct mt7601u_tssi_params { @@ -279,6 +281,7 @@ struct mt7601u_rxwi; extern const struct ieee80211_ops mt7601u_ops; void mt7601u_init_debugfs(struct mt7601u_dev *dev); +void mt7601u_exit_debugfs(struct mt7601u_dev *dev); u32 mt7601u_rr(struct mt7601u_dev *dev, u32 offset); void mt7601u_wr(struct mt7601u_dev *dev, u32 offset, u32 val);