[PATCH 08/18] staging/android: remove size arg of sync_timeline_create()

From: Gustavo Padovan
Date: Tue May 31 2016 - 16:01:28 EST


From: Gustavo Padovan <gustavo.padovan@xxxxxxxxxxxxxxx>

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@xxxxxxxxxxxxxxx>
---
drivers/staging/android/sync.c | 7 ++-----
drivers/staging/android/sync.h | 7 ++-----
drivers/staging/android/sync_debug.c | 2 +-
3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/drivers/staging/android/sync.c b/drivers/staging/android/sync.c
index 442d808..c83a599 100644
--- 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 f003e97..f2fbf98 100644
--- 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 6282046..cb0f888 100644
--- 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;

--
2.5.5