From: Gustavo Padovan <gustavo@padovan.org> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: linux-kernel@vger.kernel.org, devel@driverdev.osuosl.org, dri-devel@lists.freedesktop.org, "Daniel Stone" <daniels@collabora.com>, "Arve Hjønnevåg" <arve@android.com>, "Riley Andrews" <riandrews@android.com>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Rob Clark" <robdclark@gmail.com>, "Greg Hackmann" <ghackmann@google.com>, "John Harrison" <John.C.Harrison@Intel.com>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "Sumit Semwal" <sumit.semwal@linaro.org>, "Gustavo Padovan" <gustavo.padovan@collabora.co.uk> Subject: [PATCH 02/12] staging/android: drop sync_file_install() and sync_file_put() Date: Wed, 27 Apr 2016 13:27:09 -0300 [thread overview] Message-ID: <1461774439-11512-3-git-send-email-gustavo@padovan.org> (raw) In-Reply-To: <1461774439-11512-1-git-send-email-gustavo@padovan.org> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk> These two functions are just wrappers for one line functions, they call fd_install() and fput() respectively, so just get rid of them and use fd_install() and fput() directly for more simplicity. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> --- drivers/staging/android/sync.c | 20 ++++---------------- drivers/staging/android/sync.h | 19 ------------------- drivers/staging/android/sync_debug.c | 4 ++-- 3 files changed, 6 insertions(+), 37 deletions(-) diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index f9c6094..b965e2a 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -216,18 +216,6 @@ err: } EXPORT_SYMBOL(sync_file_fdget); -void sync_file_put(struct sync_file *sync_file) -{ - fput(sync_file->file); -} -EXPORT_SYMBOL(sync_file_put); - -void sync_file_install(struct sync_file *sync_file, int fd) -{ - fd_install(fd, sync_file->file); -} -EXPORT_SYMBOL(sync_file_install); - static void sync_file_add_pt(struct sync_file *sync_file, int *i, struct fence *fence) { @@ -469,15 +457,15 @@ static long sync_file_ioctl_merge(struct sync_file *sync_file, goto err_put_fence3; } - sync_file_install(fence3, fd); - sync_file_put(fence2); + fd_install(fd, fence3->file); + fput(fence2->file); return 0; err_put_fence3: - sync_file_put(fence3); + fput(fence3->file); err_put_fence2: - sync_file_put(fence2); + fput(fence2->file); err_put_fd: put_unused_fd(fd); diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h index d2a1734..c45cc7b 100644 --- a/drivers/staging/android/sync.h +++ b/drivers/staging/android/sync.h @@ -203,25 +203,6 @@ struct sync_file *sync_file_merge(const char *name, */ struct sync_file *sync_file_fdget(int fd); -/** - * sync_file_put() - puts a reference of a sync_file - * @sync_file: sync_file to put - * - * Puts a reference on @sync_fence. If this is the last reference, the - * sync_fil and all it's sync_pts will be freed - */ -void sync_file_put(struct sync_file *sync_file); - -/** - * sync_file_install() - installs a sync_file into a file descriptor - * @sync_file: sync_file to install - * @fd: file descriptor in which to install the fence - * - * Installs @sync_file into @fd. @fd's should be acquired through - * get_unused_fd_flags(O_CLOEXEC). - */ -void sync_file_install(struct sync_file *sync_file, int fd); - #ifdef CONFIG_DEBUG_FS void sync_timeline_debug_add(struct sync_timeline *obj); diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c index 5a7ec58..e4b0e41 100644 --- a/drivers/staging/android/sync_debug.c +++ b/drivers/staging/android/sync_debug.c @@ -272,12 +272,12 @@ static long sw_sync_ioctl_create_fence(struct sw_sync_timeline *obj, data.fence = fd; if (copy_to_user((void __user *)arg, &data, sizeof(data))) { - sync_file_put(sync_file); + fput(sync_file->file); err = -EFAULT; goto err; } - sync_file_install(sync_file, fd); + fd_install(fd, sync_file->file); return 0; -- 2.5.5
WARNING: multiple messages have this Message-ID (diff)
From: Gustavo Padovan <gustavo@padovan.org> To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: devel@driverdev.osuosl.org, "Rob Clark" <robdclark@gmail.com>, "Daniel Stone" <daniels@collabora.com>, "Daniel Vetter" <daniel.vetter@ffwll.ch>, "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>, "Riley Andrews" <riandrews@android.com>, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, "Arve Hjønnevåg" <arve@android.com>, "Greg Hackmann" <ghackmann@google.com>, "Gustavo Padovan" <gustavo.padovan@collabora.co.uk>, "Sumit Semwal" <sumit.semwal@linaro.org>, "John Harrison" <John.C.Harrison@Intel.com> Subject: [PATCH 02/12] staging/android: drop sync_file_install() and sync_file_put() Date: Wed, 27 Apr 2016 13:27:09 -0300 [thread overview] Message-ID: <1461774439-11512-3-git-send-email-gustavo@padovan.org> (raw) In-Reply-To: <1461774439-11512-1-git-send-email-gustavo@padovan.org> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk> These two functions are just wrappers for one line functions, they call fd_install() and fput() respectively, so just get rid of them and use fd_install() and fput() directly for more simplicity. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> --- drivers/staging/android/sync.c | 20 ++++---------------- drivers/staging/android/sync.h | 19 ------------------- drivers/staging/android/sync_debug.c | 4 ++-- 3 files changed, 6 insertions(+), 37 deletions(-) diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c index f9c6094..b965e2a 100644 --- a/drivers/staging/android/sync.c +++ b/drivers/staging/android/sync.c @@ -216,18 +216,6 @@ err: } EXPORT_SYMBOL(sync_file_fdget); -void sync_file_put(struct sync_file *sync_file) -{ - fput(sync_file->file); -} -EXPORT_SYMBOL(sync_file_put); - -void sync_file_install(struct sync_file *sync_file, int fd) -{ - fd_install(fd, sync_file->file); -} -EXPORT_SYMBOL(sync_file_install); - static void sync_file_add_pt(struct sync_file *sync_file, int *i, struct fence *fence) { @@ -469,15 +457,15 @@ static long sync_file_ioctl_merge(struct sync_file *sync_file, goto err_put_fence3; } - sync_file_install(fence3, fd); - sync_file_put(fence2); + fd_install(fd, fence3->file); + fput(fence2->file); return 0; err_put_fence3: - sync_file_put(fence3); + fput(fence3->file); err_put_fence2: - sync_file_put(fence2); + fput(fence2->file); err_put_fd: put_unused_fd(fd); diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h index d2a1734..c45cc7b 100644 --- a/drivers/staging/android/sync.h +++ b/drivers/staging/android/sync.h @@ -203,25 +203,6 @@ struct sync_file *sync_file_merge(const char *name, */ struct sync_file *sync_file_fdget(int fd); -/** - * sync_file_put() - puts a reference of a sync_file - * @sync_file: sync_file to put - * - * Puts a reference on @sync_fence. If this is the last reference, the - * sync_fil and all it's sync_pts will be freed - */ -void sync_file_put(struct sync_file *sync_file); - -/** - * sync_file_install() - installs a sync_file into a file descriptor - * @sync_file: sync_file to install - * @fd: file descriptor in which to install the fence - * - * Installs @sync_file into @fd. @fd's should be acquired through - * get_unused_fd_flags(O_CLOEXEC). - */ -void sync_file_install(struct sync_file *sync_file, int fd); - #ifdef CONFIG_DEBUG_FS void sync_timeline_debug_add(struct sync_timeline *obj); diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c index 5a7ec58..e4b0e41 100644 --- a/drivers/staging/android/sync_debug.c +++ b/drivers/staging/android/sync_debug.c @@ -272,12 +272,12 @@ static long sw_sync_ioctl_create_fence(struct sw_sync_timeline *obj, data.fence = fd; if (copy_to_user((void __user *)arg, &data, sizeof(data))) { - sync_file_put(sync_file); + fput(sync_file->file); err = -EFAULT; goto err; } - sync_file_install(sync_file, fd); + fd_install(fd, sync_file->file); return 0; -- 2.5.5
next prev parent reply other threads:[~2016-04-27 16:27 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-04-27 16:27 [PATCH 00/12] De-stage Sync File Framework Gustavo Padovan 2016-04-27 16:27 ` Gustavo Padovan 2016-04-27 16:27 ` [PATCH 01/12] staging/android: remove redundant comments on sync_merge_data Gustavo Padovan 2016-04-27 16:27 ` Gustavo Padovan 2016-05-02 21:00 ` Pavel Machek 2016-05-02 21:00 ` Pavel Machek 2016-05-02 21:11 ` Gustavo Padovan 2016-05-02 21:11 ` Gustavo Padovan 2016-04-27 16:27 ` Gustavo Padovan [this message] 2016-04-27 16:27 ` [PATCH 02/12] staging/android: drop sync_file_install() and sync_file_put() Gustavo Padovan 2016-04-27 16:27 ` [PATCH 03/12] staging/android: move sync_file functions comments to sync.c Gustavo Padovan 2016-04-27 16:27 ` Gustavo Padovan 2016-04-27 16:27 ` [PATCH 04/12] staging/android: make sync_file_merge() static Gustavo Padovan 2016-04-27 16:27 ` Gustavo Padovan 2016-04-27 16:27 ` [PATCH 05/12] staging/android: make sync_file_fdget() static Gustavo Padovan 2016-04-27 16:27 ` Gustavo Padovan 2016-04-27 16:27 ` [PATCH 06/12] staging/android: prepare sync_file for de-staging Gustavo Padovan 2016-05-02 21:04 ` Pavel Machek 2016-05-02 21:04 ` Pavel Machek 2016-05-02 21:13 ` Gustavo Padovan 2016-05-02 21:13 ` Gustavo Padovan 2016-04-27 16:27 ` [PATCH 07/12] staging/android: improve documentation for sync_file Gustavo Padovan 2016-04-27 16:27 ` [PATCH 08/12] staging/android: style fix: alignment to match the open parenthesis Gustavo Padovan 2016-04-27 16:27 ` Gustavo Padovan 2016-04-27 16:27 ` [PATCH 09/12] dma-buf/sync_file: de-stage sync_file headers Gustavo Padovan 2016-04-27 16:27 ` Gustavo Padovan 2016-04-27 16:27 ` [PATCH 10/12] dma-buf/sync_file: de-stage sync_file Gustavo Padovan 2016-04-27 16:27 ` Gustavo Padovan 2016-04-27 16:27 ` [PATCH 11/12] Documentation: include sync_file into DocBook Gustavo Padovan 2016-04-27 16:27 ` Gustavo Padovan 2016-04-27 16:27 ` [PATCH 12/12] Documentation: add Sync File doc Gustavo Padovan 2016-04-27 16:27 ` Gustavo Padovan 2016-04-27 19:05 ` Daniel Vetter 2016-04-27 19:05 ` Daniel Vetter 2016-04-27 19:09 ` [PATCH 00/12] De-stage Sync File Framework Daniel Vetter 2016-04-27 19:09 ` Daniel Vetter 2016-04-28 13:45 ` Gustavo Padovan
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=1461774439-11512-3-git-send-email-gustavo@padovan.org \ --to=gustavo@padovan.org \ --cc=John.C.Harrison@Intel.com \ --cc=arve@android.com \ --cc=daniel.vetter@ffwll.ch \ --cc=daniels@collabora.com \ --cc=devel@driverdev.osuosl.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=ghackmann@google.com \ --cc=gregkh@linuxfoundation.org \ --cc=gustavo.padovan@collabora.co.uk \ --cc=linux-kernel@vger.kernel.org \ --cc=maarten.lankhorst@linux.intel.com \ --cc=riandrews@android.com \ --cc=robdclark@gmail.com \ --cc=sumit.semwal@linaro.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: linkBe 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.