From 829682b3dba16120c3366d8eaef620a8a41e5fb8 Mon Sep 17 00:00:00 2001 From: "Gustavo A. R. Silva" Date: Sun, 12 Nov 2017 03:18:59 -0500 Subject: [PATCH] media: uvcvideo: Remove unnecessary NULL check before debugfs_remove_recursive debugfs_remove_recursive() accepts a NULL parameter and returns immediately, there's no need for a NULL check in the caller. This issue was detected with the help of Coccinelle. [Reword commit message, address uvc_debugfs_cleanup_stream()] Signed-off-by: Gustavo A. R. Silva Signed-off-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab --- drivers/media/usb/uvc/uvc_debugfs.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_debugfs.c b/drivers/media/usb/uvc/uvc_debugfs.c index 368f8f8dfcb5..77e7c2419b9b 100644 --- a/drivers/media/usb/uvc/uvc_debugfs.c +++ b/drivers/media/usb/uvc/uvc_debugfs.c @@ -106,9 +106,6 @@ void uvc_debugfs_init_stream(struct uvc_streaming *stream) void uvc_debugfs_cleanup_stream(struct uvc_streaming *stream) { - if (stream->debugfs_dir == NULL) - return; - debugfs_remove_recursive(stream->debugfs_dir); stream->debugfs_dir = NULL; } @@ -128,6 +125,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); } -- 2.45.2