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

Commit 6f02ecff authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: synx: Remove synx handle status details from logging"

parents fce2d2f2 d392b913

drivers/media/platform/msm/synx/synx_debugfs.c

+4 −13
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
struct dentry *my_direc;

const char delim[] = ",";

int columns = NAME_COLUMN |

	BOUND_COLUMN | STATE_COLUMN | ERROR_CODES;

BOUND_COLUMN | ERROR_CODES;



void populate_bound_rows(

	struct synx_table_row *row,
@@ -29,14 +29,13 @@ void populate_bound_rows( 
	char *end)

{

	int j;

	int state = SYNX_STATE_INVALID;





	for (j = 0; j < row->num_bound_synxs;

		j++) {

		cur += scnprintf(cur, end - cur,

			"\n\tID: %d State: %s",

			row->bound_synxs[j].external_data->synx_obj,

			state);

			"\n\tID: %d ",

			row->bound_synxs[j].external_data->synx_obj);

	}

}

static ssize_t synx_table_read(struct file *file,
@@ -51,7 +50,6 @@ static ssize_t synx_table_read(struct file *file, 
	char *dbuf, *cur, *end;



	int i = 0;

	int state = SYNX_STATE_INVALID;

	ssize_t len = 0;

	s32 index;
@@ -64,8 +62,6 @@ static ssize_t synx_table_read(struct file *file, 
		cur += scnprintf(cur, end - cur, "|   Name   |");

	if (columns & BOUND_COLUMN)

		cur += scnprintf(cur, end - cur, "|   Bound   |");

	if (columns & STATE_COLUMN)

		cur += scnprintf(cur, end - cur, "|  Status  |");

	cur += scnprintf(cur, end - cur, "\n");

	for (i = 1; i < SYNX_MAX_OBJS; i++) {

		row = &dev->synx_table[i];
@@ -84,11 +80,6 @@ static ssize_t synx_table_read(struct file *file, 
		if (columns & BOUND_COLUMN)

			cur += scnprintf(cur, end - cur,

				"|%11d|", row->num_bound_synxs);

		if (columns & STATE_COLUMN) {

			state = synx_status(row);

			cur += scnprintf(cur, end - cur,

				"|%10d|", state);

		}

		if ((columns & BOUND_COLUMN) &&

			(row->num_bound_synxs > 0)) {

			cur += scnprintf(

drivers/media/platform/msm/synx/synx_util.c

+1 −2
Original line number Diff line number Diff line
@@ -252,9 +252,8 @@ int synx_deinit_object(struct synx_table_row *row) 
		}

	}



	mutex_lock(&synx_dev->row_locks[index]);



	memset(row, 0, sizeof(*row));

	mutex_unlock(&synx_dev->row_locks[index]);

	clear_bit(index, synx_dev->bitmap);



	pr_debug("destroying synx obj at %d successful\n", index);