[media] uvcvideo: Change result code of debugfs_init to void

The device driver should keep going even if debugfs initialization fails.
So, change the return type to void.

Signed-off-by: Jaejoong Kim <climbbb.kim@gmail.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/usb/uvc/uvc_debugfs.c b/drivers/media/usb/uvc/uvc_debugfs.c
index 14561a5abb793df434e40bbaa29a5db7d43e5e9c..368f8f8dfcb5c5917e63fbf1cf25bb80f1d4ed50 100644 (file)
--- a/drivers/media/usb/uvc/uvc_debugfs.c
+++ b/drivers/media/usb/uvc/uvc_debugfs.c
@@ -75,14 +75,14 @@ static const struct file_operations uvc_debugfs_stats_fops = {
 
 static struct dentry *uvc_debugfs_root_dir;
 
-int uvc_debugfs_init_stream(struct uvc_streaming *stream)
+void uvc_debugfs_init_stream(struct uvc_streaming *stream)
 {
        struct usb_device *udev = stream->dev->udev;
        struct dentry *dent;
        char dir_name[32];
 
        if (uvc_debugfs_root_dir == NULL)
-               return -ENODEV;
+               return;
 
        sprintf(dir_name, "%u-%u", udev->bus->busnum, udev->devnum);
 
@@ -90,7 +90,7 @@ int uvc_debugfs_init_stream(struct uvc_streaming *stream)
        if (IS_ERR_OR_NULL(dent)) {
                uvc_printk(KERN_INFO, "Unable to create debugfs %s "
                           "directory.\n", dir_name);
-               return -ENODEV;
+               return;
        }
 
        stream->debugfs_dir = dent;
@@ -100,10 +100,8 @@ int uvc_debugfs_init_stream(struct uvc_streaming *stream)
        if (IS_ERR_OR_NULL(dent)) {
                uvc_printk(KERN_INFO, "Unable to create debugfs stats file.\n");
                uvc_debugfs_cleanup_stream(stream);
-               return -ENODEV;
+               return;
        }
-
-       return 0;
 }
 
 void uvc_debugfs_cleanup_stream(struct uvc_streaming *stream)
@@ -115,18 +113,17 @@ void uvc_debugfs_cleanup_stream(struct uvc_streaming *stream)
        stream->debugfs_dir = NULL;
 }
 
-int uvc_debugfs_init(void)
+void uvc_debugfs_init(void)
 {
        struct dentry *dir;
 
        dir = debugfs_create_dir("uvcvideo", usb_debug_root);
        if (IS_ERR_OR_NULL(dir)) {
                uvc_printk(KERN_INFO, "Unable to create debugfs directory\n");
-               return -ENODATA;
+               return;
        }
 
        uvc_debugfs_root_dir = dir;
-       return 0;
 }
 
 void uvc_debugfs_cleanup(void)

diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h
index 3d6cc62f3cd2e6ffbec0f0d7d6e15be65d260a5b..4205e7a423f0fed13473559ea503e35dd1a69771 100644 (file)
--- a/drivers/media/usb/uvc/uvcvideo.h
+++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -757,9 +757,9 @@ void uvc_video_decode_isight(struct urb *urb, struct uvc_streaming *stream,
                struct uvc_buffer *buf);
 
 /* debugfs and statistics */
-int uvc_debugfs_init(void);
+void uvc_debugfs_init(void);
 void uvc_debugfs_cleanup(void);
-int uvc_debugfs_init_stream(struct uvc_streaming *stream);
+void uvc_debugfs_init_stream(struct uvc_streaming *stream);
 void uvc_debugfs_cleanup_stream(struct uvc_streaming *stream);
 
 size_t uvc_video_stats_dump(struct uvc_streaming *stream, char *buf,