From 63b8a425d9cbd0ae21b3fbab647f2c28c7f42d75 Mon Sep 17 00:00:00 2001 From: Pratham Pratap Date: Fri, 3 Dec 2021 11:40:14 +0530 Subject: [PATCH] USB: dwc3: remove debugfs root dentry storage There is no need to keep around the debugfs "root" directory for the dwc3 device. Instead, look it up anytime we need to find it. This will help when callers get out-of-order and we had the potential to have a "stale" pointer around for the root dentry, as has happened in the past. Change-Id: I7fd1973704cd2a9e193fd77e01f7e09236f41117 Tested-by: Jack Pham Reviewed-by: Peter Chen Acked-by: Felipe Balbi Link: https://lore.kernel.org/r/20210609093924.3293230-1-gregkh@linuxfoundation.org Signed-off-by: Greg Kroah-Hartman Git-commit: 8562d5bfc0fcdfd3aef32991e17dca585ae5ae7d Git-Repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git [quic_ppratap@quicinc.com: resolved trivial merge conflicts] Signed-off-by: Pratham Pratap --- drivers/usb/dwc3/core.h | 2 -- drivers/usb/dwc3/debugfs.c | 8 ++++---- drivers/usb/dwc3/gadget.c | 4 +++- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index a3b7ab11a1b8..3bd15568f1ab 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h @@ -1081,7 +1081,6 @@ struct dwc3_scratchpad_array { * @link_state: link state * @speed: device speed (super, high, full, low) * @hwparams: copy of hwparams registers - * @root: debugfs root folder pointer * @regset: debugfs pointer to regdump file * @dbg_lsp_select: current debug lsp mux register selection * @test_mode: true when we're entering a USB test mode @@ -1307,7 +1306,6 @@ struct dwc3 { u8 num_eps; struct dwc3_hwparams hwparams; - struct dentry *root; struct debugfs_regset32 *regset; u32 dbg_lsp_select; diff --git a/drivers/usb/dwc3/debugfs.c b/drivers/usb/dwc3/debugfs.c index 038eb17167ce..fe0d800227ac 100644 --- a/drivers/usb/dwc3/debugfs.c +++ b/drivers/usb/dwc3/debugfs.c @@ -1023,8 +1023,10 @@ static void dwc3_debugfs_create_endpoint_files(struct dwc3_ep *dep, void dwc3_debugfs_create_endpoint_dir(struct dwc3_ep *dep) { struct dentry *dir; + struct dentry *root; - dir = debugfs_create_dir(dep->name, dep->dwc->root); + root = debugfs_lookup(dev_name(dep->dwc->dev), usb_debug_root); + dir = debugfs_create_dir(dep->name, root); if (!dir) { pr_err("%s: failed to create dir %s\n", __func__, dep->name); return; @@ -1278,8 +1280,6 @@ void dwc3_debugfs_init(struct dwc3 *dwc) return; } - dwc->root = root; - debugfs_create_file("regdump", 0444, root, dwc, &dwc3_regdump_fops); debugfs_create_file("lsp_dump", S_IRUGO | S_IWUSR, root, dwc, @@ -1310,6 +1310,6 @@ void dwc3_debugfs_init(struct dwc3 *dwc) void dwc3_debugfs_exit(struct dwc3 *dwc) { - debugfs_remove_recursive(dwc->root); + debugfs_remove(debugfs_lookup(dev_name(dwc->dev), usb_debug_root)); kfree(dwc->regset); } diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index a73035e7480f..bcded2a041c5 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c @@ -3144,7 +3144,9 @@ static void dwc3_gadget_free_endpoints(struct dwc3 *dwc) list_del(&dep->endpoint.ep_list); } - debugfs_remove_recursive(debugfs_lookup(dep->name, dwc->root)); + debugfs_remove_recursive(debugfs_lookup(dep->name, + debugfs_lookup(dev_name(dep->dwc->dev), + usb_debug_root))); kfree(dep); } }