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

Commit e4006713 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Chris Wilson
Browse files

i915: Re-use DEFINE_SHOW_ATTRIBUTE() macro 



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

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180316141213.38774-1-andriy.shevchenko@linux.intel.com
parent 1947fd13

drivers/gpu/drm/i915/gvt/debugfs.c

+1 −12
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/i915/i915_debugfs.c

+11 −65
Original line number Diff line number Diff line
@@ -3562,7 +3562,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 = &dev_priv->drm;

	struct drm_connector *connector;

	struct drm_connector_list_iter conn_iter;

	struct intel_dp *intel_dp;
@@ -3596,10 +3597,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,

			   &dev_priv->drm);

			   inode->i_private);

}



static const struct file_operations i915_displayport_test_active_fops = {
@@ -3613,7 +3612,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 = &dev_priv->drm;

	struct drm_connector *connector;

	struct drm_connector_list_iter conn_iter;

	struct intel_dp *intel_dp;
@@ -3652,26 +3652,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,

			   &dev_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 = &dev_priv->drm;

	struct drm_connector *connector;

	struct drm_connector_list_iter conn_iter;

	struct intel_dp *intel_dp;
@@ -3698,23 +3684,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,

			   &dev_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])

{
@@ -4875,19 +4845,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, inode->i_private);

}



static const struct file_operations i915_dpcd_fops = {

	.owner = THIS_MODULE,

	.open = i915_dpcd_open,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = single_release,

};

DEFINE_SHOW_ATTRIBUTE(i915_dpcd);



static int i915_panel_show(struct seq_file *m, void *data)

{
@@ -4909,19 +4867,7 @@ static int i915_panel_show(struct seq_file *m, void *data) 


	return 0;

}



static int i915_panel_open(struct inode *inode, struct file *file)

{

	return single_open(file, i915_panel_show, inode->i_private);

}



static const struct file_operations i915_panel_fops = {

	.owner = THIS_MODULE,

	.open = i915_panel_open,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = single_release,

};

DEFINE_SHOW_ATTRIBUTE(i915_panel);



/**

 * i915_debugfs_connector_add - add i915 specific connector debugfs files