ipts: Cleanup ipts-i915 to pass checkpatch

Signed-off-by: Dorian Stoll <dorian.stoll@tmsp.io>
linux-surface · Nov 7, 2019 · b7c60a6 · b7c60a6
1 parent 1623943
commit b7c60a6
Show file tree

Hide file tree

Showing 6 changed files with 239 additions and 240 deletions.
diff --git a/drivers/gpu/drm/i915_legacy/i915_debugfs.c b/drivers/gpu/drm/i915_legacy/i915_debugfs.c
@@ -39,9 +39,9 @@
 #include "intel_guc_submission.h"
 #include "intel_hdcp.h"
 #include "intel_hdmi.h"
+#include "intel_ipts.h"
 #include "intel_pm.h"
 #include "intel_psr.h"
-#include "intel_ipts.h"
 
 static inline struct drm_i915_private *node_to_i915(struct drm_info_node *node)
 {
@@ -4569,7 +4569,7 @@ static const struct file_operations i915_fifo_underrun_reset_ops = {
 };
 
 static ssize_t
-i915_intel_ipts_cleanup_write(struct file *filp,
+i915_ipts_cleanup_write(struct file *filp,
 			       const char __user *ubuf,
 			       size_t cnt, loff_t *ppos)
 {
@@ -4585,20 +4585,20 @@ i915_intel_ipts_cleanup_write(struct file *filp,
 	if (!flag)
 		return cnt;
 
-	intel_ipts_cleanup(dev);
+	ipts_cleanup(dev);
 
 	return cnt;
 }
 
-static const struct file_operations i915_intel_ipts_cleanup_ops = {
+static const struct file_operations i915_ipts_cleanup_ops = {
 	.owner = THIS_MODULE,
 	.open = simple_open,
-	.write = i915_intel_ipts_cleanup_write,
+	.write = i915_ipts_cleanup_write,
 	.llseek = default_llseek,
 };
 
 static ssize_t
-i915_intel_ipts_init_write(struct file *filp,
+i915_ipts_init_write(struct file *filp,
 			       const char __user *ubuf,
 			       size_t cnt, loff_t *ppos)
 {
@@ -4614,15 +4614,15 @@ i915_intel_ipts_init_write(struct file *filp,
 	if (!flag)
 		return cnt;
 
-	intel_ipts_init(dev);
+	ipts_init(dev);
 
 	return cnt;
 }
 
-static const struct file_operations i915_intel_ipts_init_ops = {
+static const struct file_operations i915_ipts_init_ops = {
 	.owner = THIS_MODULE,
 	.open = simple_open,
-	.write = i915_intel_ipts_init_write,
+	.write = i915_ipts_init_write,
 	.llseek = default_llseek,
 };
 
@@ -4702,8 +4702,8 @@ static const struct i915_debugfs_files {
 	{"i915_ipc_status", &i915_ipc_status_fops},
 	{"i915_drrs_ctl", &i915_drrs_ctl_fops},
 	{"i915_edp_psr_debug", &i915_edp_psr_debug_fops},
-	{"i915_intel_ipts_cleanup", &i915_intel_ipts_cleanup_ops},
-	{"i915_intel_ipts_init", &i915_intel_ipts_init_ops},
+	{"i915_ipts_cleanup", &i915_ipts_cleanup_ops},
+	{"i915_ipts_init", &i915_ipts_init_ops},
 };
 
 int i915_debugfs_register(struct drm_i915_private *dev_priv)

diff --git a/drivers/gpu/drm/i915_legacy/i915_drv.c b/drivers/gpu/drm/i915_legacy/i915_drv.c
@@ -59,11 +59,11 @@
 #include "intel_dp.h"
 #include "intel_drv.h"
 #include "intel_fbdev.h"
+#include "intel_ipts.h"
 #include "intel_pm.h"
 #include "intel_sprite.h"
 #include "intel_uc.h"
 #include "intel_workarounds.h"
-#include "intel_ipts.h"
 
 static struct drm_driver driver;
 
@@ -725,7 +725,7 @@ static int i915_load_modeset_init(struct drm_device *dev)
 	intel_init_ipc(dev_priv);
 
 	if (INTEL_GEN(dev_priv) >= 9 && i915_modparams.enable_guc && i915_modparams.enable_ipts)
-		intel_ipts_init(dev);
+		ipts_init(dev);
 
 	return 0;
 
@@ -1923,7 +1923,7 @@ void i915_driver_unload(struct drm_device *dev)
 	disable_rpm_wakeref_asserts(dev_priv);
 
 	if (INTEL_GEN(dev_priv) >= 9 && i915_modparams.enable_guc && i915_modparams.enable_ipts)
-		intel_ipts_cleanup(dev);
+		ipts_cleanup(dev);
 
 	i915_driver_unregister(dev_priv);
 

diff --git a/drivers/gpu/drm/i915_legacy/i915_irq.c b/drivers/gpu/drm/i915_legacy/i915_irq.c
@@ -40,8 +40,8 @@
 #include "i915_drv.h"
 #include "i915_trace.h"
 #include "intel_drv.h"
-#include "intel_psr.h"
 #include "intel_ipts.h"
+#include "intel_psr.h"
 
 /**
  * DOC: interrupt handling
@@ -1522,7 +1522,7 @@ gen8_cs_irq_handler(struct intel_engine_cs *engine, u32 iir)
 	}
 
 	if (iir & GT_RENDER_PIPECTL_NOTIFY_INTERRUPT && i915_modparams.enable_ipts)
-		intel_ipts_notify_complete();
+		ipts_notify_complete();
 
 	if (tasklet)
 		tasklet_hi_schedule(&engine->execlists.tasklet);