[SRU][E][PATCH 29/52] drm/i915: fix include order in intel_tc.*

You-Sheng Yang vicamo.yang at canonical.com
Wed Apr 22 14:11:52 UTC 2020

From: Lucas De Marchi <lucas.demarchi at intel.com>

BugLink: https://bugs.launchpad.net/bugs/1868936

Separate local includes with a blank line and sort the groups

v2: don't make intel_tc.h be the first include
v3: don't make local includes be included first

Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
Reviewed-by: Imre Deak <imre.deak at intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190709155403.29370-1-lucas.demarchi@intel.com
(cherry picked from commit c99fd7b3908e287ccd20be4f9eefe597c7d354fd)
Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
 drivers/gpu/drm/i915/display/intel_tc.c | 2 +-
 drivers/gpu/drm/i915/display/intel_tc.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
index 8a1a405d37e2..cdbc6ea12ead 100644
--- a/drivers/gpu/drm/i915/display/intel_tc.c
+++ b/drivers/gpu/drm/i915/display/intel_tc.c
@@ -3,9 +3,9 @@
  * Copyright © 2019 Intel Corporation
+#include "i915_drv.h"
 #include "intel_display.h"
 #include "intel_dp_mst.h"
-#include "i915_drv.h"
 #include "intel_tc.h"
 static const char *tc_port_mode_name(enum tc_port_mode mode)
diff --git a/drivers/gpu/drm/i915/display/intel_tc.h b/drivers/gpu/drm/i915/display/intel_tc.h
index 0d8411d4a91d..706c5bc050a5 100644
--- a/drivers/gpu/drm/i915/display/intel_tc.h
+++ b/drivers/gpu/drm/i915/display/intel_tc.h
@@ -6,8 +6,9 @@
 #ifndef __INTEL_TC_H__
 #define __INTEL_TC_H__
-#include <linux/types.h>
 #include <linux/mutex.h>
+#include <linux/types.h>
 #include "intel_drv.h"
 bool intel_tc_port_connected(struct intel_digital_port *dig_port);

More information about the kernel-team mailing list