From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Jaejoong Kim <climbbb.kim@gmail.com>
Cc: linux-media@vger.kernel.org
Subject: Re: [PATCH] [media] uvcvideo: change result code of debugfs_init to void
Date: Thu, 19 Jan 2017 02:04:37 +0200 [thread overview]
Message-ID: <1781087.7gDRW24Af0@avalon> (raw)
In-Reply-To: <1484184681-27384-1-git-send-email-climbbb.kim@gmail.com>
Hi Jaejoong,
Thank you for the patch.
On Thursday 12 Jan 2017 10:31:21 Jaejoong Kim wrote:
> 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>
and applied to my tree. I'll send a pull request for v4.11.
> ---
> drivers/media/usb/uvc/uvc_debugfs.c | 15 ++++++---------
> drivers/media/usb/uvc/uvcvideo.h | 4 ++--
> 2 files changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/media/usb/uvc/uvc_debugfs.c
> b/drivers/media/usb/uvc/uvc_debugfs.c index 14561a5..368f8f8 100644
> --- 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 7e4d3ee..1d1b992 100644
> --- a/drivers/media/usb/uvc/uvcvideo.h
> +++ b/drivers/media/usb/uvc/uvcvideo.h
> @@ -745,9 +745,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,
--
Regards,
Laurent Pinchart
prev parent reply other threads:[~2017-01-19 0:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-12 1:31 [PATCH] [media] uvcvideo: change result code of debugfs_init to void Jaejoong Kim
2017-01-19 0:04 ` Laurent Pinchart [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1781087.7gDRW24Af0@avalon \
--to=laurent.pinchart@ideasonboard.com \
--cc=climbbb.kim@gmail.com \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.