[Intel-gfx] [PATCH 2/4] drm/i915: fix include order in intel_tc.*

[Lucas De Marchi]

On Thu, Jul 04, 2019 at 04:56:41PM +0300, Imre Deak wrote:
>On Wed, Jul 03, 2019 at 05:06:47PM -0700, Lucas De Marchi wrote:
>> Make intel_tc.h the first include so we guarantee it's self-contained.
>> Sort the rest. Same principle applies for includes in the header.
>>
>> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
>> ---
>>  drivers/gpu/drm/i915/display/intel_tc.c | 5 +++--
>>  drivers/gpu/drm/i915/display/intel_tc.h | 5 +++--
>>  2 files changed, 6 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_tc.c b/drivers/gpu/drm/i915/display/intel_tc.c
>> index 1a9dd32fb0a5..e6e6163c1232 100644
>> --- a/drivers/gpu/drm/i915/display/intel_tc.c
>> +++ b/drivers/gpu/drm/i915/display/intel_tc.c
>> @@ -3,10 +3,11 @@
>>   * Copyright © 2019 Intel Corporation
>>   */
>>
>> +#include "intel_tc.h"
>
>I get your point to keep the self-contained check work even without the
>header test files, but I'm not sure if we need that, since there is the
>header test file approach in place. I haven't seen this done anywhere
>else, so we shouldn't make an exception here either imo.
>
>+Jani for that.
>
>Fixing the rest of my ABC screw-up looks ok.

I can change this and leave it for later to maintain
consistency across the codebase.

Lucas De Marchi

>
>> +
>> +#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..45ae30537b78 100644
>> --- a/drivers/gpu/drm/i915/display/intel_tc.h
>> +++ b/drivers/gpu/drm/i915/display/intel_tc.h
>> @@ -6,10 +6,11 @@
>>  #ifndef __INTEL_TC_H__
>>  #define __INTEL_TC_H__
>>
>> -#include <linux/types.h>
>> -#include <linux/mutex.h>
>>  #include "intel_drv.h"
>>
>> +#include <linux/mutex.h>
>> +#include <linux/types.h>
>> +
>>  bool intel_tc_port_connected(struct intel_digital_port *dig_port);
>>  u32 intel_tc_port_get_lane_mask(struct intel_digital_port *dig_port);
>>  int intel_tc_port_fia_max_lane_count(struct intel_digital_port *dig_port);
>> --
>> 2.21.0
>>