Re: [PATCH v2 05/13] staging/android: make sync_file_fdget() static

Re: [PATCH v2 05/13] staging/android: make sync_file_fdget() static

[Hillf Danton]

> 
> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> 
> There is no plan in the near future to use this function outside of this
> file so keep it as static.
> 
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
Acked-by: Hillf Danton <hillf.zj@alibaba-inc.com>

>  drivers/staging/android/sync.c | 3 +--
>  drivers/staging/android/sync.h | 1 -
>  2 files changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
> index e9bf251..7e0fa20 100644
> --- a/drivers/staging/android/sync.c
> +++ b/drivers/staging/android/sync.c
> @@ -212,7 +212,7 @@ EXPORT_SYMBOL(sync_file_create);
>   * Ensures @fd references a valid sync_file, increments the refcount of the
>   * backing file. Returns the sync_file or NULL in case of error.
>   */
> -struct sync_file *sync_file_fdget(int fd)
> +static struct sync_file *sync_file_fdget(int fd)
>  {
>  	struct file *file = fget(fd);
> 
> @@ -228,7 +228,6 @@ err:
>  	fput(file);
>  	return NULL;
>  }
> -EXPORT_SYMBOL(sync_file_fdget);
> 
>  static void sync_file_add_pt(struct sync_file *sync_file, int *i,
>  			     struct fence *fence)
> diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
> index ffc6df6..1f164df 100644
> --- a/drivers/staging/android/sync.h
> +++ b/drivers/staging/android/sync.h
> @@ -168,7 +168,6 @@ void sync_timeline_signal(struct sync_timeline *obj);
>  struct fence *sync_pt_create(struct sync_timeline *parent, int size);
> 
>  struct sync_file *sync_file_create(const char *name, struct fence *fence);
> -struct sync_file *sync_file_fdget(int fd);
> 
>  #ifdef CONFIG_DEBUG_FS
> 
> --
> 2.5.5
> 
> 

[PATCH v2 00/13] De-stage Sync File Framework

[Gustavo Padovan]

From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

Hi,

This patchset sits on top of Sync ABI Rework v13:

https://www.spinics.net/lists/dri-devel/msg105667.html

The first eight clean up and prepare sync_file for de-staging. The last four
patches do the de-staging, moving files to drivers/dma-buf/ and include/linux/
plus adding Documentation.

As the de-stage depends upon many changes on the staging tree it would
be good to get all the patches merged through the staging tree if Sumit
agrees with that.

The next step on the Sync de-stage is clean up the remaining bits
of the Sync Framework, mainly SW_SYNC, which is only used for testing.

v2: - Add Reviewed-by: tag from Daniel Vetter to all patches.
    - Take in sugestions for the Sync File Documentation (Daniel)
    - Remove name arg from sync_file_crate() (Daniel)
    - Revome leftover EXPORT_SYMBOL(sync_file_merge) (Daniel)

Thanks,

	Gustavo

Gustavo Padovan (13):
  staging/android: remove redundant comments on sync_merge_data
  staging/android: drop sync_file_install() and sync_file_put()
  staging/android: move sync_file functions comments to sync.c
  staging/android: make sync_file_merge() static
  staging/android: make sync_file_fdget() static
  staging/android: remove name arg from sync_file_create()
  staging/android: prepare sync_file for de-staging
  staging/android: improve documentation for sync_file
  staging/android: style fix: alignment to match the open parenthesis
  dma-buf/sync_file: de-stage sync_file headers
  dma-buf/sync_file: de-stage sync_file
  Documentation: include sync_file into DocBook
  Documentation: add Sync File doc

 Documentation/DocBook/device-drivers.tmpl |   2 +
 Documentation/sync_file.txt               |  69 ++++++
 drivers/Kconfig                           |   2 +
 drivers/dma-buf/Kconfig                   |  11 +
 drivers/dma-buf/Makefile                  |   1 +
 drivers/dma-buf/sync_file.c               | 395 ++++++++++++++++++++++++++++++
 drivers/staging/android/Kconfig           |   1 +
 drivers/staging/android/sync.c            | 362 ---------------------------
 drivers/staging/android/sync.h            |  91 +------
 drivers/staging/android/sync_debug.c      |   8 +-
 drivers/staging/android/uapi/sync.h       | 100 --------
 include/linux/sync_file.h                 |  57 +++++
 include/uapi/linux/sync_file.h            | 100 ++++++++
 13 files changed, 644 insertions(+), 555 deletions(-)
 create mode 100644 Documentation/sync_file.txt
 create mode 100644 drivers/dma-buf/Kconfig
 create mode 100644 drivers/dma-buf/sync_file.c
 delete mode 100644 drivers/staging/android/uapi/sync.h
 create mode 100644 include/linux/sync_file.h
 create mode 100644 include/uapi/linux/sync_file.h

-- 
2.5.5

[PATCH v2 05/13] staging/android: make sync_file_fdget() static

[Gustavo Padovan]

From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

There is no plan in the near future to use this function outside of this
file so keep it as static.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 drivers/staging/android/sync.c | 3 +--
 drivers/staging/android/sync.h | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index e9bf251..7e0fa20 100644
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -212,7 +212,7 @@ EXPORT_SYMBOL(sync_file_create);
  * Ensures @fd references a valid sync_file, increments the refcount of the
  * backing file. Returns the sync_file or NULL in case of error.
  */
-struct sync_file *sync_file_fdget(int fd)
+static struct sync_file *sync_file_fdget(int fd)
 {
 	struct file *file = fget(fd);
 
@@ -228,7 +228,6 @@ err:
 	fput(file);
 	return NULL;
 }
-EXPORT_SYMBOL(sync_file_fdget);
 
 static void sync_file_add_pt(struct sync_file *sync_file, int *i,
 			     struct fence *fence)
diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
index ffc6df6..1f164df 100644
--- a/drivers/staging/android/sync.h
+++ b/drivers/staging/android/sync.h
@@ -168,7 +168,6 @@ void sync_timeline_signal(struct sync_timeline *obj);
 struct fence *sync_pt_create(struct sync_timeline *parent, int size);
 
 struct sync_file *sync_file_create(const char *name, struct fence *fence);
-struct sync_file *sync_file_fdget(int fd);
 
 #ifdef CONFIG_DEBUG_FS
 
-- 
2.5.5