2021-02-16 14:25:49

by Greg KH

Subject: [PATCH 2/2] driver core: dd: remove deferred_devices variable

No need to save the debugfs dentry for the "devices_deferred" debugfs
file (gotta love the juxtaposition), if we need to remove it we can look
it up from debugfs itself.

Cc: "Rafael J. Wysocki" <[email protected]>
Cc: [email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/base/dd.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 9179825ff646..66c31cda5462 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -55,7 +55,6 @@ static DEFINE_MUTEX(deferred_probe_mutex);
static LIST_HEAD(deferred_probe_pending_list);
static LIST_HEAD(deferred_probe_active_list);
static atomic_t deferred_trigger_count = ATOMIC_INIT(0);
-static struct dentry *deferred_devices;
static bool initcalls_done;

/* Save the async probe drivers' name from kernel cmdline */
@@ -310,8 +309,8 @@ static DECLARE_DELAYED_WORK(deferred_probe_timeout_work, deferred_probe_timeout_
*/
static int deferred_probe_initcall(void)
{
- deferred_devices = debugfs_create_file("devices_deferred", 0444, NULL,
- NULL, &deferred_devs_fops);
+ debugfs_create_file("devices_deferred", 0444, NULL, NULL,
+ &deferred_devs_fops);

driver_deferred_probe_enable = true;
driver_deferred_probe_trigger();
@@ -336,7 +335,7 @@ late_initcall(deferred_probe_initcall);

static void __exit deferred_probe_exit(void)
{
- debugfs_remove_recursive(deferred_devices);
+ debugfs_remove_recursive(debugfs_lookup("devices_deferred", NULL));
}
__exitcall(deferred_probe_exit);

--
2.30.1

2021-02-16 14:39:01

by Rafael J. Wysocki

Subject: Re: [PATCH 2/2] driver core: dd: remove deferred_devices variable

On Tue, Feb 16, 2021 at 3:24 PM Greg Kroah-Hartman
<[email protected]> wrote:
>
> No need to save the debugfs dentry for the "devices_deferred" debugfs
> file (gotta love the juxtaposition), if we need to remove it we can look
> it up from debugfs itself.
>
> Cc: "Rafael J. Wysocki" <[email protected]>
> Cc: [email protected]
> Signed-off-by: Greg Kroah-Hartman <[email protected]>

Reviewed-by: Rafael J. Wysocki <[email protected]>

> ---
> drivers/base/dd.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/base/dd.c b/drivers/base/dd.c
> index 9179825ff646..66c31cda5462 100644
> --- a/drivers/base/dd.c
> +++ b/drivers/base/dd.c
> @@ -55,7 +55,6 @@ static DEFINE_MUTEX(deferred_probe_mutex);
> static LIST_HEAD(deferred_probe_pending_list);
> static LIST_HEAD(deferred_probe_active_list);
> static atomic_t deferred_trigger_count = ATOMIC_INIT(0);
> -static struct dentry *deferred_devices;
> static bool initcalls_done;
>
> /* Save the async probe drivers' name from kernel cmdline */
> @@ -310,8 +309,8 @@ static DECLARE_DELAYED_WORK(deferred_probe_timeout_work, deferred_probe_timeout_
> */
> static int deferred_probe_initcall(void)
> {
> - deferred_devices = debugfs_create_file("devices_deferred", 0444, NULL,
> - NULL, &deferred_devs_fops);
> + debugfs_create_file("devices_deferred", 0444, NULL, NULL,
> + &deferred_devs_fops);
>
> driver_deferred_probe_enable = true;
> driver_deferred_probe_trigger();
> @@ -336,7 +335,7 @@ late_initcall(deferred_probe_initcall);
>
> static void __exit deferred_probe_exit(void)
> {
> - debugfs_remove_recursive(deferred_devices);
> + debugfs_remove_recursive(debugfs_lookup("devices_deferred", NULL));
> }
> __exitcall(deferred_probe_exit);
>
> --
> 2.30.1
>

2021-02-16 14:41:17

by Greg KH

Subject: Re: [PATCH 2/2] driver core: dd: remove deferred_devices variable

On Tue, Feb 16, 2021 at 03:34:27PM +0100, Rafael J. Wysocki wrote:
> On Tue, Feb 16, 2021 at 3:24 PM Greg Kroah-Hartman
> <[email protected]> wrote:
> >
> > No need to save the debugfs dentry for the "devices_deferred" debugfs
> > file (gotta love the juxtaposition), if we need to remove it we can look
> > it up from debugfs itself.
> >
> > Cc: "Rafael J. Wysocki" <[email protected]>
> > Cc: [email protected]
> > Signed-off-by: Greg Kroah-Hartman <[email protected]>
>
> Reviewed-by: Rafael J. Wysocki <[email protected]>

Thanks for the quick review, I'll queue these up after 5.12-rc1 is out.

greg k-h