2014-06-29 08:42:56

by Fabian Frédérick

Subject: [PATCH 1/1] virtio: console: remove unnecessary null test before debugfs_remove_recursive

Fix checkpatch warning:
WARNING: debugfs_remove_recursive(NULL) is safe this check is probably not required

Cc: Amit Shah <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: [email protected]
Signed-off-by: Fabian Frederick <[email protected]>
---
drivers/char/virtio_console.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c
index 60aafb8..b585b47 100644
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -2262,8 +2262,7 @@ static int __init init(void)
unregister:
unregister_virtio_driver(&virtio_console);
free:
- if (pdrvdata.debugfs_dir)
- debugfs_remove_recursive(pdrvdata.debugfs_dir);
+ debugfs_remove_recursive(pdrvdata.debugfs_dir);
class_destroy(pdrvdata.class);
return err;
}
@@ -2276,8 +2275,7 @@ static void __exit fini(void)
unregister_virtio_driver(&virtio_rproc_serial);

class_destroy(pdrvdata.class);
- if (pdrvdata.debugfs_dir)
- debugfs_remove_recursive(pdrvdata.debugfs_dir);
+ debugfs_remove_recursive(pdrvdata.debugfs_dir);
}
module_init(init);
module_exit(fini);
--
1.8.4.5

2014-06-30 06:46:30

by Amit Shah

Subject: Re: [PATCH 1/1] virtio: console: remove unnecessary null test before debugfs_remove_recursive

On (Sun) 29 Jun 2014 [10:41:33], Fabian Frederick wrote:
> Fix checkpatch warning:
> WARNING: debugfs_remove_recursive(NULL) is safe this check is probably not required
>
> Cc: Amit Shah <[email protected]>
> Cc: Arnd Bergmann <[email protected]>
> Cc: [email protected]
> Signed-off-by: Fabian Frederick <[email protected]>

Reviewed-by: Amit Shah <[email protected]>

Rusty, can you pick this up please?

Thanks,

Amit

2014-07-09 00:35:43

by Rusty Russell

Subject: Re: [PATCH 1/1] virtio: console: remove unnecessary null test before debugfs_remove_recursive

Amit Shah <[email protected]> writes:
> On (Sun) 29 Jun 2014 [10:41:33], Fabian Frederick wrote:
>> Fix checkpatch warning:
>> WARNING: debugfs_remove_recursive(NULL) is safe this check is probably not required
>>
>> Cc: Amit Shah <[email protected]>
>> Cc: Arnd Bergmann <[email protected]>
>> Cc: [email protected]
>> Signed-off-by: Fabian Frederick <[email protected]>
>
> Reviewed-by: Amit Shah <[email protected]>
>
> Rusty, can you pick this up please?

Applied.

Thanks,
Rusty.