linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] gpu/drm: remove DEFINE_DPU_DEBUGFS_SEQ_FOPS()
@ 2018-12-02  3:19 Yangtao Li
  2018-12-04 14:59 ` Sean Paul
  0 siblings, 1 reply; 3+ messages in thread
From: Yangtao Li @ 2018-12-02  3:19 UTC (permalink / raw)
  To: arnd, abhinavk, bzwang, colin.king, airlied, jsanka, jcrouse,
	ryadav, robdclark, linux, swboyd, skolluku, seanpaul,
	thierry.reding
  Cc: linux-kernel, linux-arm-msm, dri-devel, freedreno, linux-tegra,
	Yangtao Li

We already have the DEFINE_SHOW_ATTRIBUTE.There is no need to define
such a macro separately,so remove DEFINE_DPU_DEBUGFS_SEQ_FOPS.
Also use DEFINE_SHOW_ATTRIBUTE to simplify some code.

Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
---
 drivers/gpu/drm/armada/armada_debugfs.c      | 21 ++++--------
 drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c | 14 +-------
 drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c     | 33 +++---------------
 drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c  | 17 ++-------
 drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c      | 36 ++++----------------
 drivers/gpu/host1x/debug.c                   | 34 ++++--------------
 6 files changed, 29 insertions(+), 126 deletions(-)

diff --git a/drivers/gpu/drm/armada/armada_debugfs.c b/drivers/gpu/drm/armada/armada_debugfs.c
index 6758c3a83de2..64dccb7c8be2 100644
--- a/drivers/gpu/drm/armada/armada_debugfs.c
+++ b/drivers/gpu/drm/armada/armada_debugfs.c
@@ -28,7 +28,7 @@ static int armada_debugfs_gem_linear_show(struct seq_file *m, void *data)
 	return 0;
 }
 
-static int armada_debugfs_reg_show(struct seq_file *m, void *data)
+static int reg_show(struct seq_file *m, void *data)
 {
 	struct drm_device *dev = m->private;
 	struct armada_private *priv = dev->dev_private;
@@ -50,18 +50,7 @@ static int armada_debugfs_reg_show(struct seq_file *m, void *data)
 	return 0;
 }
 
-static int armada_debugfs_reg_r_open(struct inode *inode, struct file *file)
-{
-	return single_open(file, armada_debugfs_reg_show, inode->i_private);
-}
-
-static const struct file_operations fops_reg_r = {
-	.owner = THIS_MODULE,
-	.open = armada_debugfs_reg_r_open,
-	.read = seq_read,
-	.llseek = seq_lseek,
-	.release = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(reg);
 
 static int armada_debugfs_write(struct file *file, const char __user *ptr,
 	size_t len, loff_t *off)
@@ -119,12 +108,14 @@ int armada_drm_debugfs_init(struct drm_minor *minor)
 		return ret;
 
 	de = debugfs_create_file("reg", S_IFREG | S_IRUSR,
-				 minor->debugfs_root, minor->dev, &fops_reg_r);
+				 minor->debugfs_root, minor->dev,
+				 &reg_fops);
 	if (!de)
 		return -ENOMEM;
 
 	de = debugfs_create_file("reg_wr", S_IFREG | S_IWUSR,
-				 minor->debugfs_root, minor->dev, &fops_reg_w);
+				 minor->debugfs_root, minor->dev,
+				 &fops_reg_w);
 	if (!de)
 		return -ENOMEM;
 
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c
index 879c13fe74e0..7607aac9449c 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c
@@ -299,18 +299,6 @@ static void dpu_disable_all_irqs(struct dpu_kms *dpu_kms)
 }
 
 #ifdef CONFIG_DEBUG_FS
-#define DEFINE_DPU_DEBUGFS_SEQ_FOPS(__prefix)				\
-static int __prefix ## _open(struct inode *inode, struct file *file)	\
-{									\
-	return single_open(file, __prefix ## _show, inode->i_private);	\
-}									\
-static const struct file_operations __prefix ## _fops = {		\
-	.owner = THIS_MODULE,						\
-	.open = __prefix ## _open,					\
-	.release = single_release,					\
-	.read = seq_read,						\
-	.llseek = seq_lseek,						\
-}
 
 static int dpu_debugfs_core_irq_show(struct seq_file *s, void *v)
 {
@@ -341,7 +329,7 @@ static int dpu_debugfs_core_irq_show(struct seq_file *s, void *v)
 	return 0;
 }
 
-DEFINE_DPU_DEBUGFS_SEQ_FOPS(dpu_debugfs_core_irq);
+DEFINE_SHOW_ATTRIBUTE(dpu_debugfs_core_irq);
 
 int dpu_debugfs_core_irq_init(struct dpu_kms *dpu_kms,
 		struct dentry *parent)
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
index d4530d60767b..e705bad980ee 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -1309,7 +1309,7 @@ int dpu_crtc_vblank(struct drm_crtc *crtc, bool en)
 }
 
 #ifdef CONFIG_DEBUG_FS
-static int _dpu_debugfs_status_show(struct seq_file *s, void *data)
+static int status_show(struct seq_file *s, void *data)
 {
 	struct dpu_crtc *dpu_crtc;
 	struct dpu_plane_state *pstate = NULL;
@@ -1428,24 +1428,6 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data)
 	return 0;
 }
 
-static int _dpu_debugfs_status_open(struct inode *inode, struct file *file)
-{
-	return single_open(file, _dpu_debugfs_status_show, inode->i_private);
-}
-
-#define DEFINE_DPU_DEBUGFS_SEQ_FOPS(__prefix)                          \
-static int __prefix ## _open(struct inode *inode, struct file *file)	\
-{									\
-	return single_open(file, __prefix ## _show, inode->i_private);	\
-}									\
-static const struct file_operations __prefix ## _fops = {		\
-	.owner = THIS_MODULE,						\
-	.open = __prefix ## _open,					\
-	.release = single_release,					\
-	.read = seq_read,						\
-	.llseek = seq_lseek,						\
-}
-
 static int dpu_crtc_debugfs_state_show(struct seq_file *s, void *v)
 {
 	struct drm_crtc *crtc = (struct drm_crtc *) s->private;
@@ -1468,20 +1450,15 @@ static int dpu_crtc_debugfs_state_show(struct seq_file *s, void *v)
 
 	return 0;
 }
-DEFINE_DPU_DEBUGFS_SEQ_FOPS(dpu_crtc_debugfs_state);
+
+DEFINE_SHOW_ATTRIBUTE(dpu_crtc_debugfs_state);
+DEFINE_SHOW_ATTRIBUTE(status);
 
 static int _dpu_crtc_init_debugfs(struct drm_crtc *crtc)
 {
 	struct dpu_crtc *dpu_crtc;
 	struct dpu_kms *dpu_kms;
 
-	static const struct file_operations debugfs_status_fops = {
-		.open =		_dpu_debugfs_status_open,
-		.read =		seq_read,
-		.llseek =	seq_lseek,
-		.release =	single_release,
-	};
-
 	if (!crtc)
 		return -EINVAL;
 	dpu_crtc = to_dpu_crtc(crtc);
@@ -1496,7 +1473,7 @@ static int _dpu_crtc_init_debugfs(struct drm_crtc *crtc)
 	/* don't error check these */
 	debugfs_create_file("status", 0400,
 			dpu_crtc->debugfs_root,
-			dpu_crtc, &debugfs_status_fops);
+			dpu_crtc, &status_fops);
 	debugfs_create_file("state", 0600,
 			dpu_crtc->debugfs_root,
 			&dpu_crtc->base,
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
index 96cdf06e7da2..a36f9f72da87 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
@@ -1873,7 +1873,7 @@ void dpu_encoder_prepare_commit(struct drm_encoder *drm_enc)
 }
 
 #ifdef CONFIG_DEBUG_FS
-static int _dpu_encoder_status_show(struct seq_file *s, void *data)
+static int status_show(struct seq_file *s, void *data)
 {
 	struct dpu_encoder_virt *dpu_enc;
 	int i;
@@ -1912,11 +1912,7 @@ static int _dpu_encoder_status_show(struct seq_file *s, void *data)
 	return 0;
 }
 
-static int _dpu_encoder_debugfs_status_open(struct inode *inode,
-		struct file *file)
-{
-	return single_open(file, _dpu_encoder_status_show, inode->i_private);
-}
+DEFINE_SHOW_ATTRIBUTE(status);
 
 static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc)
 {
@@ -1925,13 +1921,6 @@ static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc)
 	struct dpu_kms *dpu_kms;
 	int i;
 
-	static const struct file_operations debugfs_status_fops = {
-		.open =		_dpu_encoder_debugfs_status_open,
-		.read =		seq_read,
-		.llseek =	seq_lseek,
-		.release =	single_release,
-	};
-
 	char name[DPU_NAME_SIZE];
 
 	if (!drm_enc || !drm_enc->dev || !drm_enc->dev->dev_private) {
@@ -1953,7 +1942,7 @@ static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc)
 
 	/* don't error check these */
 	debugfs_create_file("status", 0600,
-		dpu_enc->debugfs_root, dpu_enc, &debugfs_status_fops);
+		dpu_enc->debugfs_root, dpu_enc, &status_fops);
 
 	for (i = 0; i < dpu_enc->num_phys_encs; i++)
 		if (dpu_enc->phys_encs[i] &&
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
index 0a683e65a9f3..c3f036095c53 100644
--- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
+++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -113,30 +113,19 @@ static int _dpu_danger_signal_status(struct seq_file *s,
 	return 0;
 }
 
-#define DEFINE_DPU_DEBUGFS_SEQ_FOPS(__prefix)				\
-static int __prefix ## _open(struct inode *inode, struct file *file)	\
-{									\
-	return single_open(file, __prefix ## _show, inode->i_private);	\
-}									\
-static const struct file_operations __prefix ## _fops = {		\
-	.owner = THIS_MODULE,						\
-	.open = __prefix ## _open,					\
-	.release = single_release,					\
-	.read = seq_read,						\
-	.llseek = seq_lseek,						\
-}
-
 static int dpu_debugfs_danger_stats_show(struct seq_file *s, void *v)
 {
 	return _dpu_danger_signal_status(s, true);
 }
-DEFINE_DPU_DEBUGFS_SEQ_FOPS(dpu_debugfs_danger_stats);
+
+DEFINE_SHOW_ATTRIBUTE(dpu_debugfs_danger_stats);
 
 static int dpu_debugfs_safe_stats_show(struct seq_file *s, void *v)
 {
 	return _dpu_danger_signal_status(s, false);
 }
-DEFINE_DPU_DEBUGFS_SEQ_FOPS(dpu_debugfs_safe_stats);
+
+DEFINE_SHOW_ATTRIBUTE(dpu_debugfs_safe_stats);
 
 static void dpu_debugfs_danger_destroy(struct dpu_kms *dpu_kms)
 {
@@ -162,7 +151,7 @@ static int dpu_debugfs_danger_init(struct dpu_kms *dpu_kms,
 	return 0;
 }
 
-static int _dpu_debugfs_show_regset32(struct seq_file *s, void *data)
+static int dpu_regset32_show(struct seq_file *s, void *data)
 {
 	struct dpu_debugfs_regset32 *regset;
 	struct dpu_kms *dpu_kms;
@@ -212,18 +201,7 @@ static int _dpu_debugfs_show_regset32(struct seq_file *s, void *data)
 	return 0;
 }
 
-static int dpu_debugfs_open_regset32(struct inode *inode,
-		struct file *file)
-{
-	return single_open(file, _dpu_debugfs_show_regset32, inode->i_private);
-}
-
-static const struct file_operations dpu_fops_regset32 = {
-	.open =		dpu_debugfs_open_regset32,
-	.read =		seq_read,
-	.llseek =	seq_lseek,
-	.release =	single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(dpu_regset32);
 
 void dpu_debugfs_setup_regset32(struct dpu_debugfs_regset32 *regset,
 		uint32_t offset, uint32_t length, struct dpu_kms *dpu_kms)
@@ -245,7 +223,7 @@ void *dpu_debugfs_create_regset32(const char *name, umode_t mode,
 	regset->offset = round_down(regset->offset, 4);
 
 	return debugfs_create_file(name, mode, parent,
-			regset, &dpu_fops_regset32);
+			regset, &dpu_regset32_fops);
 }
 
 static int _dpu_debugfs_init(struct dpu_kms *dpu_kms)
diff --git a/drivers/gpu/host1x/debug.c b/drivers/gpu/host1x/debug.c
index 329e4a3d8ae7..de7f020e2932 100644
--- a/drivers/gpu/host1x/debug.c
+++ b/drivers/gpu/host1x/debug.c
@@ -119,7 +119,7 @@ static void show_all(struct host1x *m, struct output *o, bool show_fifo)
 	}
 }
 
-static int host1x_debug_show_all(struct seq_file *s, void *unused)
+static int host1x_all_show(struct seq_file *s, void *unused)
 {
 	struct output o = {
 		.fn = write_to_seqfile,
@@ -131,7 +131,7 @@ static int host1x_debug_show_all(struct seq_file *s, void *unused)
 	return 0;
 }
 
-static int host1x_debug_show(struct seq_file *s, void *unused)
+static int host1x_show(struct seq_file *s, void *unused)
 {
 	struct output o = {
 		.fn = write_to_seqfile,
@@ -143,29 +143,8 @@ static int host1x_debug_show(struct seq_file *s, void *unused)
 	return 0;
 }
 
-static int host1x_debug_open_all(struct inode *inode, struct file *file)
-{
-	return single_open(file, host1x_debug_show_all, inode->i_private);
-}
-
-static const struct file_operations host1x_debug_all_fops = {
-	.open = host1x_debug_open_all,
-	.read = seq_read,
-	.llseek = seq_lseek,
-	.release = single_release,
-};
-
-static int host1x_debug_open(struct inode *inode, struct file *file)
-{
-	return single_open(file, host1x_debug_show, inode->i_private);
-}
-
-static const struct file_operations host1x_debug_fops = {
-	.open = host1x_debug_open,
-	.read = seq_read,
-	.llseek = seq_lseek,
-	.release = single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(host1x_all);
+DEFINE_SHOW_ATTRIBUTE(host1x);
 
 static void host1x_debugfs_init(struct host1x *host1x)
 {
@@ -177,9 +156,10 @@ static void host1x_debugfs_init(struct host1x *host1x)
 	/* Store the created entry */
 	host1x->debugfs = de;
 
-	debugfs_create_file("status", S_IRUGO, de, host1x, &host1x_debug_fops);
+	debugfs_create_file("status", S_IRUGO, de, host1x,
+			   &host1x_fops);
 	debugfs_create_file("status_all", S_IRUGO, de, host1x,
-			    &host1x_debug_all_fops);
+			    &host1x_all_fops);
 
 	debugfs_create_u32("trace_cmdbuf", S_IRUGO|S_IWUSR, de,
 			   &host1x_debug_trace_cmdbuf);
-- 
2.17.0


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] gpu/drm: remove DEFINE_DPU_DEBUGFS_SEQ_FOPS()
  2018-12-02  3:19 [PATCH] gpu/drm: remove DEFINE_DPU_DEBUGFS_SEQ_FOPS() Yangtao Li
@ 2018-12-04 14:59 ` Sean Paul
  2018-12-15  9:13   ` Frank Lee
  0 siblings, 1 reply; 3+ messages in thread
From: Sean Paul @ 2018-12-04 14:59 UTC (permalink / raw)
  To: Yangtao Li
  Cc: arnd, abhinavk, bzwang, colin.king, airlied, jsanka, jcrouse,
	ryadav, robdclark, linux, swboyd, skolluku, seanpaul,
	thierry.reding, linux-kernel, linux-arm-msm, dri-devel,
	freedreno, linux-tegra

On Sat, Dec 01, 2018 at 10:19:11PM -0500, Yangtao Li wrote:
> We already have the DEFINE_SHOW_ATTRIBUTE.There is no need to define
> such a macro separately,so remove DEFINE_DPU_DEBUGFS_SEQ_FOPS.
> Also use DEFINE_SHOW_ATTRIBUTE to simplify some code.
> 
> Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
> ---
>  drivers/gpu/drm/armada/armada_debugfs.c      | 21 ++++--------
>  drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c | 14 +-------
>  drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c     | 33 +++---------------
>  drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c  | 17 ++-------
>  drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c      | 36 ++++----------------

For the dpu portion:
Acked-by: Sean Paul <sean@poorly.run>

>  drivers/gpu/host1x/debug.c                   | 34 ++++--------------
>  6 files changed, 29 insertions(+), 126 deletions(-)
> 
> diff --git a/drivers/gpu/drm/armada/armada_debugfs.c b/drivers/gpu/drm/armada/armada_debugfs.c
> index 6758c3a83de2..64dccb7c8be2 100644
> --- a/drivers/gpu/drm/armada/armada_debugfs.c
> +++ b/drivers/gpu/drm/armada/armada_debugfs.c
> @@ -28,7 +28,7 @@ static int armada_debugfs_gem_linear_show(struct seq_file *m, void *data)
>  	return 0;
>  }
>  
> -static int armada_debugfs_reg_show(struct seq_file *m, void *data)
> +static int reg_show(struct seq_file *m, void *data)
>  {
>  	struct drm_device *dev = m->private;
>  	struct armada_private *priv = dev->dev_private;
> @@ -50,18 +50,7 @@ static int armada_debugfs_reg_show(struct seq_file *m, void *data)
>  	return 0;
>  }
>  
> -static int armada_debugfs_reg_r_open(struct inode *inode, struct file *file)
> -{
> -	return single_open(file, armada_debugfs_reg_show, inode->i_private);
> -}
> -
> -static const struct file_operations fops_reg_r = {
> -	.owner = THIS_MODULE,
> -	.open = armada_debugfs_reg_r_open,
> -	.read = seq_read,
> -	.llseek = seq_lseek,
> -	.release = single_release,
> -};
> +DEFINE_SHOW_ATTRIBUTE(reg);
>  
>  static int armada_debugfs_write(struct file *file, const char __user *ptr,
>  	size_t len, loff_t *off)
> @@ -119,12 +108,14 @@ int armada_drm_debugfs_init(struct drm_minor *minor)
>  		return ret;
>  
>  	de = debugfs_create_file("reg", S_IFREG | S_IRUSR,
> -				 minor->debugfs_root, minor->dev, &fops_reg_r);
> +				 minor->debugfs_root, minor->dev,
> +				 &reg_fops);
>  	if (!de)
>  		return -ENOMEM;
>  
>  	de = debugfs_create_file("reg_wr", S_IFREG | S_IWUSR,
> -				 minor->debugfs_root, minor->dev, &fops_reg_w);
> +				 minor->debugfs_root, minor->dev,
> +				 &fops_reg_w);
>  	if (!de)
>  		return -ENOMEM;
>  
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c
> index 879c13fe74e0..7607aac9449c 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c
> @@ -299,18 +299,6 @@ static void dpu_disable_all_irqs(struct dpu_kms *dpu_kms)
>  }
>  
>  #ifdef CONFIG_DEBUG_FS
> -#define DEFINE_DPU_DEBUGFS_SEQ_FOPS(__prefix)				\
> -static int __prefix ## _open(struct inode *inode, struct file *file)	\
> -{									\
> -	return single_open(file, __prefix ## _show, inode->i_private);	\
> -}									\
> -static const struct file_operations __prefix ## _fops = {		\
> -	.owner = THIS_MODULE,						\
> -	.open = __prefix ## _open,					\
> -	.release = single_release,					\
> -	.read = seq_read,						\
> -	.llseek = seq_lseek,						\
> -}
>  
>  static int dpu_debugfs_core_irq_show(struct seq_file *s, void *v)
>  {
> @@ -341,7 +329,7 @@ static int dpu_debugfs_core_irq_show(struct seq_file *s, void *v)
>  	return 0;
>  }
>  
> -DEFINE_DPU_DEBUGFS_SEQ_FOPS(dpu_debugfs_core_irq);
> +DEFINE_SHOW_ATTRIBUTE(dpu_debugfs_core_irq);
>  
>  int dpu_debugfs_core_irq_init(struct dpu_kms *dpu_kms,
>  		struct dentry *parent)
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> index d4530d60767b..e705bad980ee 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
> @@ -1309,7 +1309,7 @@ int dpu_crtc_vblank(struct drm_crtc *crtc, bool en)
>  }
>  
>  #ifdef CONFIG_DEBUG_FS
> -static int _dpu_debugfs_status_show(struct seq_file *s, void *data)
> +static int status_show(struct seq_file *s, void *data)
>  {
>  	struct dpu_crtc *dpu_crtc;
>  	struct dpu_plane_state *pstate = NULL;
> @@ -1428,24 +1428,6 @@ static int _dpu_debugfs_status_show(struct seq_file *s, void *data)
>  	return 0;
>  }
>  
> -static int _dpu_debugfs_status_open(struct inode *inode, struct file *file)
> -{
> -	return single_open(file, _dpu_debugfs_status_show, inode->i_private);
> -}
> -
> -#define DEFINE_DPU_DEBUGFS_SEQ_FOPS(__prefix)                          \
> -static int __prefix ## _open(struct inode *inode, struct file *file)	\
> -{									\
> -	return single_open(file, __prefix ## _show, inode->i_private);	\
> -}									\
> -static const struct file_operations __prefix ## _fops = {		\
> -	.owner = THIS_MODULE,						\
> -	.open = __prefix ## _open,					\
> -	.release = single_release,					\
> -	.read = seq_read,						\
> -	.llseek = seq_lseek,						\
> -}
> -
>  static int dpu_crtc_debugfs_state_show(struct seq_file *s, void *v)
>  {
>  	struct drm_crtc *crtc = (struct drm_crtc *) s->private;
> @@ -1468,20 +1450,15 @@ static int dpu_crtc_debugfs_state_show(struct seq_file *s, void *v)
>  
>  	return 0;
>  }
> -DEFINE_DPU_DEBUGFS_SEQ_FOPS(dpu_crtc_debugfs_state);
> +
> +DEFINE_SHOW_ATTRIBUTE(dpu_crtc_debugfs_state);
> +DEFINE_SHOW_ATTRIBUTE(status);
>  
>  static int _dpu_crtc_init_debugfs(struct drm_crtc *crtc)
>  {
>  	struct dpu_crtc *dpu_crtc;
>  	struct dpu_kms *dpu_kms;
>  
> -	static const struct file_operations debugfs_status_fops = {
> -		.open =		_dpu_debugfs_status_open,
> -		.read =		seq_read,
> -		.llseek =	seq_lseek,
> -		.release =	single_release,
> -	};
> -
>  	if (!crtc)
>  		return -EINVAL;
>  	dpu_crtc = to_dpu_crtc(crtc);
> @@ -1496,7 +1473,7 @@ static int _dpu_crtc_init_debugfs(struct drm_crtc *crtc)
>  	/* don't error check these */
>  	debugfs_create_file("status", 0400,
>  			dpu_crtc->debugfs_root,
> -			dpu_crtc, &debugfs_status_fops);
> +			dpu_crtc, &status_fops);
>  	debugfs_create_file("state", 0600,
>  			dpu_crtc->debugfs_root,
>  			&dpu_crtc->base,
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> index 96cdf06e7da2..a36f9f72da87 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c
> @@ -1873,7 +1873,7 @@ void dpu_encoder_prepare_commit(struct drm_encoder *drm_enc)
>  }
>  
>  #ifdef CONFIG_DEBUG_FS
> -static int _dpu_encoder_status_show(struct seq_file *s, void *data)
> +static int status_show(struct seq_file *s, void *data)
>  {
>  	struct dpu_encoder_virt *dpu_enc;
>  	int i;
> @@ -1912,11 +1912,7 @@ static int _dpu_encoder_status_show(struct seq_file *s, void *data)
>  	return 0;
>  }
>  
> -static int _dpu_encoder_debugfs_status_open(struct inode *inode,
> -		struct file *file)
> -{
> -	return single_open(file, _dpu_encoder_status_show, inode->i_private);
> -}
> +DEFINE_SHOW_ATTRIBUTE(status);
>  
>  static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc)
>  {
> @@ -1925,13 +1921,6 @@ static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc)
>  	struct dpu_kms *dpu_kms;
>  	int i;
>  
> -	static const struct file_operations debugfs_status_fops = {
> -		.open =		_dpu_encoder_debugfs_status_open,
> -		.read =		seq_read,
> -		.llseek =	seq_lseek,
> -		.release =	single_release,
> -	};
> -
>  	char name[DPU_NAME_SIZE];
>  
>  	if (!drm_enc || !drm_enc->dev || !drm_enc->dev->dev_private) {
> @@ -1953,7 +1942,7 @@ static int _dpu_encoder_init_debugfs(struct drm_encoder *drm_enc)
>  
>  	/* don't error check these */
>  	debugfs_create_file("status", 0600,
> -		dpu_enc->debugfs_root, dpu_enc, &debugfs_status_fops);
> +		dpu_enc->debugfs_root, dpu_enc, &status_fops);
>  
>  	for (i = 0; i < dpu_enc->num_phys_encs; i++)
>  		if (dpu_enc->phys_encs[i] &&
> diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> index 0a683e65a9f3..c3f036095c53 100644
> --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
> @@ -113,30 +113,19 @@ static int _dpu_danger_signal_status(struct seq_file *s,
>  	return 0;
>  }
>  
> -#define DEFINE_DPU_DEBUGFS_SEQ_FOPS(__prefix)				\
> -static int __prefix ## _open(struct inode *inode, struct file *file)	\
> -{									\
> -	return single_open(file, __prefix ## _show, inode->i_private);	\
> -}									\
> -static const struct file_operations __prefix ## _fops = {		\
> -	.owner = THIS_MODULE,						\
> -	.open = __prefix ## _open,					\
> -	.release = single_release,					\
> -	.read = seq_read,						\
> -	.llseek = seq_lseek,						\
> -}
> -
>  static int dpu_debugfs_danger_stats_show(struct seq_file *s, void *v)
>  {
>  	return _dpu_danger_signal_status(s, true);
>  }
> -DEFINE_DPU_DEBUGFS_SEQ_FOPS(dpu_debugfs_danger_stats);
> +
> +DEFINE_SHOW_ATTRIBUTE(dpu_debugfs_danger_stats);
>  
>  static int dpu_debugfs_safe_stats_show(struct seq_file *s, void *v)
>  {
>  	return _dpu_danger_signal_status(s, false);
>  }
> -DEFINE_DPU_DEBUGFS_SEQ_FOPS(dpu_debugfs_safe_stats);
> +
> +DEFINE_SHOW_ATTRIBUTE(dpu_debugfs_safe_stats);
>  
>  static void dpu_debugfs_danger_destroy(struct dpu_kms *dpu_kms)
>  {
> @@ -162,7 +151,7 @@ static int dpu_debugfs_danger_init(struct dpu_kms *dpu_kms,
>  	return 0;
>  }
>  
> -static int _dpu_debugfs_show_regset32(struct seq_file *s, void *data)
> +static int dpu_regset32_show(struct seq_file *s, void *data)
>  {
>  	struct dpu_debugfs_regset32 *regset;
>  	struct dpu_kms *dpu_kms;
> @@ -212,18 +201,7 @@ static int _dpu_debugfs_show_regset32(struct seq_file *s, void *data)
>  	return 0;
>  }
>  
> -static int dpu_debugfs_open_regset32(struct inode *inode,
> -		struct file *file)
> -{
> -	return single_open(file, _dpu_debugfs_show_regset32, inode->i_private);
> -}
> -
> -static const struct file_operations dpu_fops_regset32 = {
> -	.open =		dpu_debugfs_open_regset32,
> -	.read =		seq_read,
> -	.llseek =	seq_lseek,
> -	.release =	single_release,
> -};
> +DEFINE_SHOW_ATTRIBUTE(dpu_regset32);
>  
>  void dpu_debugfs_setup_regset32(struct dpu_debugfs_regset32 *regset,
>  		uint32_t offset, uint32_t length, struct dpu_kms *dpu_kms)
> @@ -245,7 +223,7 @@ void *dpu_debugfs_create_regset32(const char *name, umode_t mode,
>  	regset->offset = round_down(regset->offset, 4);
>  
>  	return debugfs_create_file(name, mode, parent,
> -			regset, &dpu_fops_regset32);
> +			regset, &dpu_regset32_fops);
>  }
>  
>  static int _dpu_debugfs_init(struct dpu_kms *dpu_kms)
> diff --git a/drivers/gpu/host1x/debug.c b/drivers/gpu/host1x/debug.c
> index 329e4a3d8ae7..de7f020e2932 100644
> --- a/drivers/gpu/host1x/debug.c
> +++ b/drivers/gpu/host1x/debug.c
> @@ -119,7 +119,7 @@ static void show_all(struct host1x *m, struct output *o, bool show_fifo)
>  	}
>  }
>  
> -static int host1x_debug_show_all(struct seq_file *s, void *unused)
> +static int host1x_all_show(struct seq_file *s, void *unused)
>  {
>  	struct output o = {
>  		.fn = write_to_seqfile,
> @@ -131,7 +131,7 @@ static int host1x_debug_show_all(struct seq_file *s, void *unused)
>  	return 0;
>  }
>  
> -static int host1x_debug_show(struct seq_file *s, void *unused)
> +static int host1x_show(struct seq_file *s, void *unused)
>  {
>  	struct output o = {
>  		.fn = write_to_seqfile,
> @@ -143,29 +143,8 @@ static int host1x_debug_show(struct seq_file *s, void *unused)
>  	return 0;
>  }
>  
> -static int host1x_debug_open_all(struct inode *inode, struct file *file)
> -{
> -	return single_open(file, host1x_debug_show_all, inode->i_private);
> -}
> -
> -static const struct file_operations host1x_debug_all_fops = {
> -	.open = host1x_debug_open_all,
> -	.read = seq_read,
> -	.llseek = seq_lseek,
> -	.release = single_release,
> -};
> -
> -static int host1x_debug_open(struct inode *inode, struct file *file)
> -{
> -	return single_open(file, host1x_debug_show, inode->i_private);
> -}
> -
> -static const struct file_operations host1x_debug_fops = {
> -	.open = host1x_debug_open,
> -	.read = seq_read,
> -	.llseek = seq_lseek,
> -	.release = single_release,
> -};
> +DEFINE_SHOW_ATTRIBUTE(host1x_all);
> +DEFINE_SHOW_ATTRIBUTE(host1x);
>  
>  static void host1x_debugfs_init(struct host1x *host1x)
>  {
> @@ -177,9 +156,10 @@ static void host1x_debugfs_init(struct host1x *host1x)
>  	/* Store the created entry */
>  	host1x->debugfs = de;
>  
> -	debugfs_create_file("status", S_IRUGO, de, host1x, &host1x_debug_fops);
> +	debugfs_create_file("status", S_IRUGO, de, host1x,
> +			   &host1x_fops);
>  	debugfs_create_file("status_all", S_IRUGO, de, host1x,
> -			    &host1x_debug_all_fops);
> +			    &host1x_all_fops);
>  
>  	debugfs_create_u32("trace_cmdbuf", S_IRUGO|S_IWUSR, de,
>  			   &host1x_debug_trace_cmdbuf);
> -- 
> 2.17.0
> 

-- 
Sean Paul, Software Engineer, Google / Chromium OS

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] gpu/drm: remove DEFINE_DPU_DEBUGFS_SEQ_FOPS()
  2018-12-04 14:59 ` Sean Paul
@ 2018-12-15  9:13   ` Frank Lee
  0 siblings, 0 replies; 3+ messages in thread
From: Frank Lee @ 2018-12-15  9:13 UTC (permalink / raw)
  To: Sean Paul
  Cc: Arnd Bergmann, abhinavk, bzwang, Colin King, airlied, jsanka,
	jcrouse, ryadav, Rob Clark, linux, swboyd, skolluku, Sean Paul,
	Thierry Reding, Linux Kernel Mailing List, linux-arm-msm,
	dri-devel, freedreno, linux-tegra

On Tue, Dec 4, 2018 at 10:59 PM Sean Paul <sean@poorly.run> wrote:
>
> On Sat, Dec 01, 2018 at 10:19:11PM -0500, Yangtao Li wrote:
> > We already have the DEFINE_SHOW_ATTRIBUTE.There is no need to define
> > such a macro separately,so remove DEFINE_DPU_DEBUGFS_SEQ_FOPS.
> > Also use DEFINE_SHOW_ATTRIBUTE to simplify some code.
> >
> > Signed-off-by: Yangtao Li <tiny.windzz@gmail.com>
> > ---
> >  drivers/gpu/drm/armada/armada_debugfs.c      | 21 ++++--------
> >  drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c | 14 +-------
> >  drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c     | 33 +++---------------
> >  drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c  | 17 ++-------
> >  drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c      | 36 ++++----------------
>
> For the dpu portion:
> Acked-by: Sean Paul <sean@poorly.run>
ping......

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-12-15  9:13 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-02  3:19 [PATCH] gpu/drm: remove DEFINE_DPU_DEBUGFS_SEQ_FOPS() Yangtao Li
2018-12-04 14:59 ` Sean Paul
2018-12-15  9:13   ` Frank Lee

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).