Skip to contentSkip to conversation

usb: uvc_debugfs: remove unnecessary NULL check before debugfs_remove_recursive

PATCH In review Gustavo A. R. Silva 2 participants 2 messages Nov 12, 2017 – Aug 6, 2018

Subsystems (2)
Media (V4L/DVB) USB video class
lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 usb: uvc_debugfs: remove unnecessary NULL check before debugfs_remove_recursive

NULL check before freeing functions like debugfs_remove_recursive is not needed.

This issue was detected with the help of Coccinelle.

Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 drivers/media/usb/uvc/uvc_debugfs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/media/usb/uvc/uvc_debugfs.c +1 -2
index 368f8f8..6995aeb 100644
@@ -128,6 +128,5 @@ void uvc_debugfs_init(void)
 
 void uvc_debugfs_cleanup(void)
 {
-	if (uvc_debugfs_root_dir != NULL)
-		debugfs_remove_recursive(uvc_debugfs_root_dir);
+	debugfs_remove_recursive(uvc_debugfs_root_dir);
 }
Signature · 1 line
2.7.4
maintainer Reviewed-by on v1 1/1
#1 lore raw

Hi Gustavo,

Thank you for the patch.

Quoted 2 lines · On Sunday, 12 November 2017 10:18:59 EEST Gustavo A. R. Silva wrote:

NULL check before freeing functions like debugfs_remove_recursive is not needed.

"functions like debugfs_remove_recursive" seems a bit vague to me. I'd prefer being more precise here, and say that "debugfs_remove_recursive() accepts a NULL parameter and returns immediately, there's no need for a NULL check in the caller.".

Quoted 13 lines

This issue was detected with the help of Coccinelle.

Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 drivers/media/usb/uvc/uvc_debugfs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
(quoted diff) +0 -0

b/drivers/media/usb/uvc/uvc_debugfs.c index 368f8f8..6995aeb 100644

drivers/media/usb/uvc/uvc_debugfs.c void uvc_debugfs_init(void) · line 132

Quoted 7 lines
drivers/media/usb/uvc/uvc_debugfs.c +1 -2
@@ -128,6 +128,5 @@ void uvc_debugfs_init(void)
 
 void uvc_debugfs_cleanup(void)
 {
-	if (uvc_debugfs_root_dir != NULL)
-		debugfs_remove_recursive(uvc_debugfs_root_dir);
+	debugfs_remove_recursive(uvc_debugfs_root_dir);
 }

There's another occurrence in uvc_debugfs_cleanup_stream(). I'll address it as well in this patch. With that change and the commit message update,

Reviewed-by Laurent Pinchart <[email protected]>

and applied to my tree.

Signature · 3 lines
Regards,

Laurent Pinchart