Re: [Intel-gfx] [PATCH v1] i915: Re-use DEFINE_SHOW_ATTRIBUTE() macro

[Chris Wilson]

Quoting Andy Shevchenko (2018-02-14 15:41:57)
> ...instead of open coding file operations followed by custom ->open()
> callbacks per each attribute.
> 
> Signed-off-by: Andy Shevchenko 

Reviewed-by: Chris Wilson 

Note depends on rc1 backmerge.
-Chris
___
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH v1] i915: Re-use DEFINE_SHOW_ATTRIBUTE() macro

[Andy Shevchenko]

...instead of open coding file operations followed by custom ->open()
callbacks per each attribute.

Signed-off-by: Andy Shevchenko 
---
 drivers/gpu/drm/i915/gvt/debugfs.c  | 13 +--
 drivers/gpu/drm/i915/i915_debugfs.c | 76 ++---
 2 files changed, 12 insertions(+), 77 deletions(-)

diff --git a/drivers/gpu/drm/i915/gvt/debugfs.c 
b/drivers/gpu/drm/i915/gvt/debugfs.c
index 32a66dfdf112..f7d0078eb61b 100644
--- a/drivers/gpu/drm/i915/gvt/debugfs.c
+++ b/drivers/gpu/drm/i915/gvt/debugfs.c
@@ -122,18 +122,7 @@ static int vgpu_mmio_diff_show(struct seq_file *s, void 
*unused)
seq_printf(s, "Total: %d, Diff: %d\n", param.total, param.diff);
return 0;
 }
-
-static int vgpu_mmio_diff_open(struct inode *inode, struct file *file)
-{
-   return single_open(file, vgpu_mmio_diff_show, inode->i_private);
-}
-
-static const struct file_operations vgpu_mmio_diff_fops = {
-   .open   = vgpu_mmio_diff_open,
-   .read   = seq_read,
-   .llseek = seq_lseek,
-   .release= single_release,
-};
+DEFINE_SHOW_ATTRIBUTE(vgpu_mmio_diff);
 
 /**
  * intel_gvt_debugfs_add_vgpu - register debugfs entries for a vGPU
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c 
b/drivers/gpu/drm/i915/i915_debugfs.c
index 960302668649..3e44b2ddf592 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -3506,7 +3506,8 @@ static ssize_t i915_displayport_test_active_write(struct 
file *file,
 
 static int i915_displayport_test_active_show(struct seq_file *m, void *data)
 {
-   struct drm_device *dev = m->private;
+   struct drm_i915_private *dev_priv = m->private;
+   struct drm_device *dev = _priv->drm;
struct drm_connector *connector;
struct drm_connector_list_iter conn_iter;
struct intel_dp *intel_dp;
@@ -3540,10 +3541,8 @@ static int i915_displayport_test_active_show(struct 
seq_file *m, void *data)
 static int i915_displayport_test_active_open(struct inode *inode,
 struct file *file)
 {
-   struct drm_i915_private *dev_priv = inode->i_private;
-
return single_open(file, i915_displayport_test_active_show,
-  _priv->drm);
+  inode->i_private);
 }
 
 static const struct file_operations i915_displayport_test_active_fops = {
@@ -3557,7 +3556,8 @@ static const struct file_operations 
i915_displayport_test_active_fops = {
 
 static int i915_displayport_test_data_show(struct seq_file *m, void *data)
 {
-   struct drm_device *dev = m->private;
+   struct drm_i915_private *dev_priv = m->private;
+   struct drm_device *dev = _priv->drm;
struct drm_connector *connector;
struct drm_connector_list_iter conn_iter;
struct intel_dp *intel_dp;
@@ -3596,26 +3596,12 @@ static int i915_displayport_test_data_show(struct 
seq_file *m, void *data)
 
return 0;
 }
-static int i915_displayport_test_data_open(struct inode *inode,
-  struct file *file)
-{
-   struct drm_i915_private *dev_priv = inode->i_private;
-
-   return single_open(file, i915_displayport_test_data_show,
-  _priv->drm);
-}
-
-static const struct file_operations i915_displayport_test_data_fops = {
-   .owner = THIS_MODULE,
-   .open = i915_displayport_test_data_open,
-   .read = seq_read,
-   .llseek = seq_lseek,
-   .release = single_release
-};
+DEFINE_SHOW_ATTRIBUTE(i915_displayport_test_data);
 
 static int i915_displayport_test_type_show(struct seq_file *m, void *data)
 {
-   struct drm_device *dev = m->private;
+   struct drm_i915_private *dev_priv = m->private;
+   struct drm_device *dev = _priv->drm;
struct drm_connector *connector;
struct drm_connector_list_iter conn_iter;
struct intel_dp *intel_dp;
@@ -3642,23 +3628,7 @@ static int i915_displayport_test_type_show(struct 
seq_file *m, void *data)
 
return 0;
 }
-
-static int i915_displayport_test_type_open(struct inode *inode,
-  struct file *file)
-{
-   struct drm_i915_private *dev_priv = inode->i_private;
-
-   return single_open(file, i915_displayport_test_type_show,
-  _priv->drm);
-}
-
-static const struct file_operations i915_displayport_test_type_fops = {
-   .owner = THIS_MODULE,
-   .open = i915_displayport_test_type_open,
-   .read = seq_read,
-   .llseek = seq_lseek,
-   .release = single_release
-};
+DEFINE_SHOW_ATTRIBUTE(i915_displayport_test_type);
 
 static void wm_latency_show(struct seq_file *m, const uint16_t wm[8])
 {
@@ -4812,19 +4782,7 @@ static int i915_dpcd_show(struct seq_file *m, void *data)
 
return 0;
 }
-
-static int i915_dpcd_open(struct inode *inode, struct file *file)
-{
-   return single_open(file, i915_dpcd_show,