From: George Hilliard <thirtythreeforty@gmail.com>
To: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org, Neil Brown <neil@brown.name>,
George Hilliard <thirtythreeforty@gmail.com>
Subject: [PATCH 04/10] staging: mt7621-mmc: Fix warning when reloading module with debug msgs enabled
Date: Tue, 19 Feb 2019 22:17:48 -0700 [thread overview]
Message-ID: <20190220051754.12195-5-thirtythreeforty@gmail.com> (raw)
In-Reply-To: <20190220051754.12195-1-thirtythreeforty@gmail.com>
The kernel complained:
[ 510.277151] WARNING: CPU: 0 PID: 395 at fs/proc/generic.c:360 proc_register+0xf0/0x108
[ 510.292891] proc_dir_entry '/proc/msdc_debug' already registered
when doing a modprobe/rmmod/modprobe of this module if debug messages
are compiled in. Fix this by removing the proc entry when the module is
unloaded.
Signed-off-by: George Hilliard <thirtythreeforty@gmail.com>
---
drivers/staging/mt7621-mmc/dbg.c | 15 ++++++++++++---
drivers/staging/mt7621-mmc/dbg.h | 3 ++-
drivers/staging/mt7621-mmc/sd.c | 4 ++++
3 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/mt7621-mmc/dbg.c b/drivers/staging/mt7621-mmc/dbg.c
index 69b38c7e3179..5764b80893e9 100644
--- a/drivers/staging/mt7621-mmc/dbg.c
+++ b/drivers/staging/mt7621-mmc/dbg.c
@@ -295,9 +295,18 @@ static const struct file_operations msdc_debug_fops = {
.release = single_release,
};
-void msdc_debug_proc_init(void)
+// Keep ahold of the proc entry we create so it can be freed during
+// module removal
+struct proc_dir_entry *msdc_debug_proc_entry;
+
+void __init msdc_debug_proc_init(void)
{
- proc_create("msdc_debug", 0660, NULL, &msdc_debug_fops);
+ msdc_debug_proc_entry = proc_create("msdc_debug", 0660,
+ NULL, &msdc_debug_fops);
+}
+
+void __exit msdc_debug_proc_deinit(void)
+{
+ proc_remove(msdc_debug_proc_entry);
}
-EXPORT_SYMBOL_GPL(msdc_debug_proc_init);
#endif
diff --git a/drivers/staging/mt7621-mmc/dbg.h b/drivers/staging/mt7621-mmc/dbg.h
index 2d447b2d92ae..d100324aa3fe 100644
--- a/drivers/staging/mt7621-mmc/dbg.h
+++ b/drivers/staging/mt7621-mmc/dbg.h
@@ -93,7 +93,8 @@ enum msdc_dbg {
extern unsigned int sd_debug_zone[4];
#define TAG "msdc"
-void msdc_debug_proc_init(void);
+void __init msdc_debug_proc_init(void);
+void __exit msdc_debug_proc_deinit(void);
u32 msdc_time_calc(u32 old_L32, u32 old_H32, u32 new_L32, u32 new_H32);
void msdc_performance(u32 opcode, u32 sizes, u32 bRx, u32 ticks);
diff --git a/drivers/staging/mt7621-mmc/sd.c b/drivers/staging/mt7621-mmc/sd.c
index 1d357b898952..a7c7ec0d7bbb 100644
--- a/drivers/staging/mt7621-mmc/sd.c
+++ b/drivers/staging/mt7621-mmc/sd.c
@@ -1843,6 +1843,10 @@ static int __init mt_msdc_init(void)
static void __exit mt_msdc_exit(void)
{
+#if defined(MT6575_SD_DEBUG)
+ msdc_debug_proc_deinit();
+#endif
+
platform_driver_unregister(&mt_msdc_driver);
}
--
2.20.1
next prev parent reply other threads:[~2019-02-20 5:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-20 5:17 mt7621-mmc driver improvements George Hilliard
2019-02-20 5:17 ` [PATCH 01/10] staging: mt7621-mmc: fix unused variable compiler warning George Hilliard
2019-02-20 5:17 ` [PATCH 02/10] staging: mt7621-mmc: Remove obsolete comments George Hilliard
2019-02-20 5:17 ` [PATCH 03/10] staging: mt7621-mmc: Remove references to nonexistent mt7621_spi_ops George Hilliard
2019-02-20 5:17 ` George Hilliard [this message]
2019-02-20 5:17 ` [PATCH 05/10] staging: mt7621-mmc: Use pinctrl subsystem to select SDXC pin mode George Hilliard
2019-02-20 11:27 ` Jonas Gorski
2019-02-20 5:17 ` [PATCH 06/10] staging: mt7621-mmc: Bill the caller for I/O time George Hilliard
2019-02-20 5:17 ` [PATCH 07/10] staging: mt7621-mmc: Initialize completions a single time during probe George Hilliard
2019-02-20 5:17 ` [PATCH 08/10] staging: mt7621-mmc: Check for nonzero number of scatterlist entries George Hilliard
2019-02-20 5:17 ` [PATCH 09/10] staging: mt7621-mmc: Remove redundant host->mmc->f_max write George Hilliard
2019-02-20 5:17 ` [PATCH 10/10] staging: mt7621-mmc: Immediately notify mmc layer of card change detection George Hilliard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190220051754.12195-5-thirtythreeforty@gmail.com \
--to=thirtythreeforty@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=neil@brown.name \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).