Commit 5e22c19f authored by Yangtao Li's avatar Yangtao Li Committed by Mauro Carvalho Chehab
Browse files

media: platform: sti: remove bdisp_dbg_declare() and hva_dbg_declare() 



We already have the DEFINE_SHOW_ATTRIBUTE. There is no need to define
bdisp_dbg_declare and hva_dbg_declare, so remove them. Also use
DEFINE_SHOW_ATTRIBUTE to simplify some code.

Signed-off-by: default avatarYangtao Li <tiny.windzz@gmail.com>
Reviewed-by: default avatarFabien Dessenne <fabien.dessenne@st.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent 78a9f4a3

drivers/media/platform/sti/bdisp/bdisp-debug.c

+11 −23
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ static void bdisp_dbg_dump_ivmx(struct seq_file *s, 
	seq_puts(s, "Unknown conversion\n");

}



static int bdisp_dbg_last_nodes(struct seq_file *s, void *data)

static int last_nodes_show(struct seq_file *s, void *data)

{

	/* Not dumping all fields, focusing on significant ones */

	struct bdisp_dev *bdisp = s->private;
@@ -388,7 +388,7 @@ static int bdisp_dbg_last_nodes(struct seq_file *s, void *data) 
	return 0;

}



static int bdisp_dbg_last_nodes_raw(struct seq_file *s, void *data)

static int last_nodes_raw_show(struct seq_file *s, void *data)

{

	struct bdisp_dev *bdisp = s->private;

	struct bdisp_node *node;
@@ -437,7 +437,7 @@ static const char *bdisp_fmt_to_str(struct bdisp_frame frame) 
	}

}



static int bdisp_dbg_last_request(struct seq_file *s, void *data)

static int last_request_show(struct seq_file *s, void *data)

{

	struct bdisp_dev *bdisp = s->private;

	struct bdisp_request *request = &bdisp->dbg.copy_request;
@@ -474,7 +474,7 @@ static int bdisp_dbg_last_request(struct seq_file *s, void *data) 


#define DUMP(reg) seq_printf(s, #reg " \t0x%08X\n", readl(bdisp->regs + reg))



static int bdisp_dbg_regs(struct seq_file *s, void *data)

static int regs_show(struct seq_file *s, void *data)

{

	struct bdisp_dev *bdisp = s->private;

	int ret;
@@ -582,7 +582,7 @@ static int bdisp_dbg_regs(struct seq_file *s, void *data) 


#define SECOND 1000000



static int bdisp_dbg_perf(struct seq_file *s, void *data)

static int perf_show(struct seq_file *s, void *data)

{

	struct bdisp_dev *bdisp = s->private;

	struct bdisp_request *request = &bdisp->dbg.copy_request;
@@ -627,27 +627,15 @@ static int bdisp_dbg_perf(struct seq_file *s, void *data) 
	return 0;

}



#define bdisp_dbg_declare(name) \

	static int bdisp_dbg_##name##_open(struct inode *i, struct file *f) \

	{ \

		return single_open(f, bdisp_dbg_##name, i->i_private); \

	} \

	static const struct file_operations bdisp_dbg_##name##_fops = { \

		.open           = bdisp_dbg_##name##_open, \

		.read           = seq_read, \

		.llseek         = seq_lseek, \

		.release        = single_release, \

	}



#define bdisp_dbg_create_entry(name) \

	debugfs_create_file(#name, S_IRUGO, bdisp->dbg.debugfs_entry, bdisp, \

			    &bdisp_dbg_##name##_fops)

			    &name##_fops)



bdisp_dbg_declare(regs);

bdisp_dbg_declare(last_nodes);

bdisp_dbg_declare(last_nodes_raw);

bdisp_dbg_declare(last_request);

bdisp_dbg_declare(perf);

DEFINE_SHOW_ATTRIBUTE(regs);

DEFINE_SHOW_ATTRIBUTE(last_nodes);

DEFINE_SHOW_ATTRIBUTE(last_nodes_raw);

DEFINE_SHOW_ATTRIBUTE(last_request);

DEFINE_SHOW_ATTRIBUTE(perf);



int bdisp_debugfs_create(struct bdisp_dev *bdisp)

{

drivers/media/platform/sti/hva/hva-debugfs.c

+12 −24
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static void hva_dbg_perf_compute(struct hva_ctx *ctx) 
 * device debug info

 */



static int hva_dbg_device(struct seq_file *s, void *data)

static int device_show(struct seq_file *s, void *data)

{

	struct hva_dev *hva = s->private;
@@ -281,7 +281,7 @@ static int hva_dbg_device(struct seq_file *s, void *data) 
	return 0;

}



static int hva_dbg_encoders(struct seq_file *s, void *data)

static int encoders_show(struct seq_file *s, void *data)

{

	struct hva_dev *hva = s->private;

	unsigned int i = 0;
@@ -299,7 +299,7 @@ static int hva_dbg_encoders(struct seq_file *s, void *data) 
	return 0;

}



static int hva_dbg_last(struct seq_file *s, void *data)

static int last_show(struct seq_file *s, void *data)

{

	struct hva_dev *hva = s->private;

	struct hva_ctx *last_ctx = &hva->dbg.last_ctx;
@@ -316,7 +316,7 @@ static int hva_dbg_last(struct seq_file *s, void *data) 
	return 0;

}



static int hva_dbg_regs(struct seq_file *s, void *data)

static int regs_show(struct seq_file *s, void *data)

{

	struct hva_dev *hva = s->private;
@@ -325,26 +325,14 @@ static int hva_dbg_regs(struct seq_file *s, void *data) 
	return 0;

}



#define hva_dbg_declare(name)						  \

	static int hva_dbg_##name##_open(struct inode *i, struct file *f) \

	{								  \

		return single_open(f, hva_dbg_##name, i->i_private);	  \

	}								  \

	static const struct file_operations hva_dbg_##name##_fops = {	  \

		.open		= hva_dbg_##name##_open,		  \

		.read		= seq_read,				  \

		.llseek		= seq_lseek,				  \

		.release	= single_release,			  \

	}



#define hva_dbg_create_entry(name)					 \

	debugfs_create_file(#name, 0444, hva->dbg.debugfs_entry, hva, \

			    &hva_dbg_##name##_fops)

			    &name##_fops)



hva_dbg_declare(device);

hva_dbg_declare(encoders);

hva_dbg_declare(last);

hva_dbg_declare(regs);

DEFINE_SHOW_ATTRIBUTE(device);

DEFINE_SHOW_ATTRIBUTE(encoders);

DEFINE_SHOW_ATTRIBUTE(last);

DEFINE_SHOW_ATTRIBUTE(regs);



void hva_debugfs_create(struct hva_dev *hva)

{
@@ -380,7 +368,7 @@ void hva_debugfs_remove(struct hva_dev *hva) 
 * context (instance) debug info

 */



static int hva_dbg_ctx(struct seq_file *s, void *data)

static int ctx_show(struct seq_file *s, void *data)

{

	struct hva_ctx *ctx = s->private;
@@ -392,7 +380,7 @@ static int hva_dbg_ctx(struct seq_file *s, void *data) 
	return 0;

}



hva_dbg_declare(ctx);

DEFINE_SHOW_ATTRIBUTE(ctx);



void hva_dbg_ctx_create(struct hva_ctx *ctx)

{
@@ -407,7 +395,7 @@ void hva_dbg_ctx_create(struct hva_ctx *ctx) 


	ctx->dbg.debugfs_entry = debugfs_create_file(name, 0444,

						     hva->dbg.debugfs_entry,

						     ctx, &hva_dbg_ctx_fops);

						     ctx, &ctx_fops);

}



void hva_dbg_ctx_remove(struct hva_ctx *ctx)

CRA Git | Maintained and supported by SUSTech CRA and CCSE