Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 62627c8f authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Greg Kroah-Hartman
Browse files

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: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarSumit Semwal <sumit.semwal@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 724812d6

drivers/staging/android/sync.c

+2 −5
Original line number Diff line number Diff line
@@ -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;

drivers/staging/android/sync.h

+2 −5
Original line number Diff line number Diff line
@@ -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);



/**

drivers/staging/android/sync_debug.c

+1 −1
Original line number Diff line number Diff line
@@ -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;