2014-06-26 17:15:52

by Fabian Frédérick

Subject: [PATCH 1/1] kernel/trace/trace.c: remove unnecessary null test before debugfs_remove

This fixes checkpatch warning:

"WARNING: debugfs_remove(NULL) is safe this check is probably not required"

Cc: Steven Rostedt <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Signed-off-by: Fabian Frederick <[email protected]>
---
kernel/trace/trace.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 384ede3..58c78e4 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -6095,10 +6095,8 @@ destroy_trace_option_files(struct trace_option_dentry *topts)
if (!topts)
return;

- for (cnt = 0; topts[cnt].opt; cnt++) {
- if (topts[cnt].entry)
- debugfs_remove(topts[cnt].entry);
- }
+ for (cnt = 0; topts[cnt].opt; cnt++)
+ debugfs_remove(topts[cnt].entry);

kfree(topts);
}
--
1.8.4.5

2014-06-26 17:44:38

by Steven Rostedt

Subject: Re: [PATCH 1/1] kernel/trace/trace.c: remove unnecessary null test before debugfs_remove

On Thu, 26 Jun 2014 19:14:31 +0200
Fabian Frederick <[email protected]> wrote:

> This fixes checkpatch warning:
>
> "WARNING: debugfs_remove(NULL) is safe this check is probably not required"

Thanks, applied to my 3.17 queue.

-- Steve

>
> Cc: Steven Rostedt <[email protected]>
> Cc: Frederic Weisbecker <[email protected]>
> Signed-off-by: Fabian Frederick <[email protected]>
> ---
> kernel/trace/trace.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
> index 384ede3..58c78e4 100644
> --- a/kernel/trace/trace.c
> +++ b/kernel/trace/trace.c
> @@ -6095,10 +6095,8 @@ destroy_trace_option_files(struct trace_option_dentry *topts)
> if (!topts)
> return;
>
> - for (cnt = 0; topts[cnt].opt; cnt++) {
> - if (topts[cnt].entry)
> - debugfs_remove(topts[cnt].entry);
> - }
> + for (cnt = 0; topts[cnt].opt; cnt++)
> + debugfs_remove(topts[cnt].entry);
>
> kfree(topts);
> }