staging/android: remove size arg of sync_timeline_create()

After we removed sw_sync_timeline this arg has not been really used by
anyone, all its users pass the size of struct sync_timeline there.

So simplify this function but not requiring the size anymore.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Sumit Semwal <sumit.semwal@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index 442d808027892deb7fec3444ff111c65d2d50362..c83a599e2221c7602563af06ea69d2b82141231d 100644 (file)
--- a/drivers/staging/android/sync.c
+++ b/drivers/staging/android/sync.c
@@ -30,15 +30,12 @@
 
 static const struct fence_ops timeline_fence_ops;
 
-struct sync_timeline *sync_timeline_create(int size, const char *drv_name,
+struct sync_timeline *sync_timeline_create(const char *drv_name,
                                           const char *name)
 {
        struct sync_timeline *obj;
 
-       if (size < sizeof(struct sync_timeline))
-               return NULL;
-
-       obj = kzalloc(size, GFP_KERNEL);
+       obj = kzalloc(sizeof(*obj), GFP_KERNEL);
        if (!obj)
                return NULL;
 

diff --git a/drivers/staging/android/sync.h b/drivers/staging/android/sync.h
index f003e97a8c790c0f1cdcc6dc7ea33d8a929a6655..f2fbf984ec6bc02d5dc4fadcdba429977ac5342d 100644 (file)
--- a/drivers/staging/android/sync.h
+++ b/drivers/staging/android/sync.h
@@ -66,16 +66,13 @@ static inline struct sync_timeline *fence_parent(struct fence *fence)
 
 /**
  * sync_timeline_create() - creates a sync object
- * @size:      size to allocate for this obj
  * @drv_name:  sync_timeline driver name
  * @name:      sync_timeline name
  *
- * Creates a new sync_timeline. @size bytes will be allocated allowing
- * for implementation specific data to be kept after the generic
- * sync_timeline struct. Returns the sync_timeline object or NULL in
+ * Creates a new sync_timeline. Returns the sync_timeline object or NULL in
  * case of error.
  */
-struct sync_timeline *sync_timeline_create(int size, const char *drv_name,
+struct sync_timeline *sync_timeline_create(const char *drv_name,
                                           const char *name);
 
 /**

diff --git a/drivers/staging/android/sync_debug.c b/drivers/staging/android/sync_debug.c
index 6282046ec13233501c5eec7e4fe225d0bf5f5794..cb0f8883cdb3fa209357f7c2cba201032eb5ac98 100644 (file)
--- a/drivers/staging/android/sync_debug.c
+++ b/drivers/staging/android/sync_debug.c
@@ -218,7 +218,7 @@ static int sw_sync_debugfs_open(struct inode *inode, struct file *file)
 
        get_task_comm(task_comm, current);
 
-       obj = sync_timeline_create(sizeof(*obj), "sw_sync", task_comm);
+       obj = sync_timeline_create("sw_sync", task_comm);
        if (!obj)
                return -ENOMEM;