drm/msm/dpu: Convert to DEFINE_SHOW_ATTRIBUTE
PATCH v2 1/1 drm/msm/dpu: Convert to DEFINE_SHOW_ATTRIBUTE
Use DEFINE_SHOW_ATTRIBUTE macro to simplify the code.
Signed-off-by Qinglang Miao <[email protected]>
---
v2: based on linux-next(20200917), and can be applied to
mainline cleanly now.
drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c | 15 +--------- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 29 ++------------------ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 15 ++-------- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 17 ++---------- 4 files changed, 8 insertions(+), 68 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.c +1 -14
@@ -288,19 +288,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) {struct dpu_irq *irq_obj = s->private;
@@ -328,7 +315,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);void dpu_debugfs_core_irq_init (struct dpu_kms *dpu_kms,struct dentry *parent)
drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +3 -26
@@ -1177,23 +1177,7 @@ 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, \ -} +DEFINE_SHOW_ATTRIBUTE (_dpu_debugfs_status);static int dpu_crtc_debugfs_state_show (struct seq_file *s,void *v) {
@@ -1210,25 +1194,18 @@ 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);static int _dpu_crtc_init_debugfs (struct drm_crtc *crtc) {struct dpu_crtc *dpu_crtc =to_dpu_crtc (crtc); -static const struct file_operations debugfs_status_fops = { - .open = _dpu_debugfs_status_open, - .read = seq_read, - .llseek = seq_lseek, - .release = single_release, - }; - dpu_crtc->debugfs_root =debugfs_create_dir (dpu_crtc->name, crtc->dev->primary->debugfs_root);debugfs_create_file ("status" ,0400 , dpu_crtc->debugfs_root, - dpu_crtc, &debugfs_status_fops); + dpu_crtc, &_dpu_debugfs_status_fops); debugfs_create_file("state", 0600, dpu_crtc->debugfs_root, &dpu_crtc->base,
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +2 -13
@@ -1880,24 +1880,13 @@ 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 (_dpu_encoder_status);static int _dpu_encoder_init_debugfs (struct drm_encoder *drm_enc) {struct dpu_encoder_virt *dpu_enc =to_dpu_encoder_virt (drm_enc);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->dev) {
@@ -1913,7 +1902,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, &_dpu_encoder_status_fops);for (i =0 ; i < dpu_enc->num_phys_encs; i++)if (dpu_enc->phys_encs[i]->ops.late_register)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +2 -15
@@ -85,30 +85,17 @@ 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_init (struct dpu_kms *dpu_kms,struct dentry *parent)
Signature · 1 line
2.23.0