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

Commit 5c1401f8 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Greg Kroah-Hartman
Browse files

staging/android: remove .{fence, timeline}_value_str() from timeline_ops 



Now that the value of fence and the timeline are not stored by sw_sync
anymore we can remove this extra abstraction to retrieve this data.

This patch changes both fence_ops (.fence_value_str and
.timeline_value_str) to return the str directly.

It also clean up struct sync_timeline_ops by removing both ops from there.

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 63bb0bc1

drivers/staging/android/sw_sync.c

+0 −17
Original line number Diff line number Diff line
@@ -38,25 +38,8 @@ struct fence *sw_sync_pt_create(struct sw_sync_timeline *obj, u32 value) 
}

EXPORT_SYMBOL(sw_sync_pt_create);



static void sw_sync_timeline_value_str(struct sync_timeline *sync_timeline,

				       char *str, int size)

{

	struct sw_sync_timeline *timeline =

		(struct sw_sync_timeline *)sync_timeline;

	snprintf(str, size, "%d", timeline->value);

}



static void sw_sync_fence_value_str(struct fence *fence, char *str, int size)

{

	struct sw_sync_pt *pt = (struct sw_sync_pt *)fence;



	snprintf(str, size, "%d", pt->value);

}



static struct sync_timeline_ops sw_sync_timeline_ops = {

	.driver_name = "sw_sync",

	.timeline_value_str = sw_sync_timeline_value_str,

	.fence_value_str = sw_sync_fence_value_str,

};



struct sw_sync_timeline *sw_sync_timeline_create(const char *name)

drivers/staging/android/sync.c

+2 −14
Original line number Diff line number Diff line
@@ -185,14 +185,7 @@ static bool android_fence_enable_signaling(struct fence *fence) 
static void android_fence_value_str(struct fence *fence,

				    char *str, int size)

{

	struct sync_timeline *parent = fence_parent(fence);



	if (!parent->ops->fence_value_str) {

		if (size)

			*str = 0;

		return;

	}

	parent->ops->fence_value_str(fence, str, size);

	snprintf(str, size, "%d", fence->seqno);

}



static void android_fence_timeline_value_str(struct fence *fence,
@@ -200,12 +193,7 @@ static void android_fence_timeline_value_str(struct fence *fence, 
{

	struct sync_timeline *parent = fence_parent(fence);



	if (!parent->ops->timeline_value_str) {

		if (size)

			*str = 0;

		return;

	}

	parent->ops->timeline_value_str(parent, str, size);

	snprintf(str, size, "%d", parent->value);

}



static const struct fence_ops android_fence_ops = {

drivers/staging/android/sync.h

+0 −9
Original line number Diff line number Diff line
@@ -28,18 +28,9 @@ struct sync_timeline; 
/**

 * struct sync_timeline_ops - sync object implementation ops

 * @driver_name:	name of the implementation

 * @timeline_value_str: fill str with the value of the sync_timeline's counter

 * @fence_value_str:	fill str with the value of the fence

 */

struct sync_timeline_ops {

	const char *driver_name;



	/* optional */

	void (*timeline_value_str)(struct sync_timeline *timeline, char *str,

				   int size);



	/* optional */

	void (*fence_value_str)(struct fence *fence, char *str, int size);

};



/**

drivers/staging/android/sync_debug.c

+2 −10
Original line number Diff line number Diff line
@@ -133,16 +133,8 @@ static void sync_print_obj(struct seq_file *s, struct sync_timeline *obj) 
	struct list_head *pos;

	unsigned long flags;



	seq_printf(s, "%s %s", obj->name, obj->ops->driver_name);



	if (obj->ops->timeline_value_str) {

		char value[64];



		obj->ops->timeline_value_str(obj, value, sizeof(value));

		seq_printf(s, ": %s", value);

	}



	seq_puts(s, "\n");

	seq_printf(s, "%s %s: %d\n", obj->name, obj->ops->driver_name,

		   obj->value);



	spin_lock_irqsave(&obj->child_list_lock, flags);

	list_for_each(pos, &obj->child_list_head) {

drivers/staging/android/trace/sync.h

+3 −9
Original line number Diff line number Diff line
@@ -15,21 +15,15 @@ TRACE_EVENT(sync_timeline, 


	TP_STRUCT__entry(

			__string(name, timeline->name)

			__array(char, value, 32)

			__field(u32, value)

	),



	TP_fast_assign(

			__assign_str(name, timeline->name);

			if (timeline->ops->timeline_value_str) {

				timeline->ops->timeline_value_str(timeline,

							__entry->value,

							sizeof(__entry->value));

			} else {

				__entry->value[0] = '\0';

			}

			__entry->value = timeline->value;

	),



	TP_printk("name=%s value=%s", __get_str(name), __entry->value)

	TP_printk("name=%s value=%d", __get_str(name), __entry->value)

);



#endif /* if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ) */