[Intel-gfx] [PATCH] drm/i915: remove excess line continuation backslashes

Jani Nikula jani.nikula at intel.com
Thu Nov 15 11:54:08 UTC 2018


On Wed, 14 Nov 2018, Jani Nikula <jani.nikula at intel.com> wrote:
> On Wed, 14 Nov 2018, Ville Syrjälä <ville.syrjala at linux.intel.com> wrote:
>> On Wed, Nov 14, 2018 at 01:21:30PM +0200, Jani Nikula wrote:
>>> While removing .palette_offsets, I removed the commas after
>>> .trans_offsets in the macros, but failed to remove the line continuation
>>> backslashes.
>>> 
>>> While at it, also remove another extra comma to be in line with the
>>> other related macros.
>>
>> In general I like having the comma after the last element in an
>> array/enum/whatever. In this case it doesn't really matter, but
>> in cases like
>>
>>   enum {
>>   	yes,
>>   	no,
>> + 	maybe,
>>   };
>>
>> it will result in a cleaner diff.
>
> Totally agreed; it just doesn't make a difference here, and none of the
> other places here have it, so off it goes.
>
>> Anyways, patch is
>> Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
>
> Thanks. /me looks at CI expectantly.

And pushed.

>
> BR,
> Jani.
>
>>
>>> 
>>> Fixes: 74c1e826427a ("drm/i915: remove palette_offsets from device info in favor of _PICK()")
>>> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
>>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>>> ---
>>>  drivers/gpu/drm/i915/i915_pci.c | 4 ++--
>>>  1 file changed, 2 insertions(+), 2 deletions(-)
>>> 
>>> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
>>> index 4ccab8372dd4..983ae7fd8217 100644
>>> --- a/drivers/gpu/drm/i915/i915_pci.c
>>> +++ b/drivers/gpu/drm/i915/i915_pci.c
>>> @@ -36,13 +36,13 @@
>>>  	.pipe_offsets = { PIPE_A_OFFSET, PIPE_B_OFFSET, \
>>>  			  PIPE_C_OFFSET, PIPE_EDP_OFFSET }, \
>>>  	.trans_offsets = { TRANSCODER_A_OFFSET, TRANSCODER_B_OFFSET, \
>>> -			   TRANSCODER_C_OFFSET, TRANSCODER_EDP_OFFSET } \
>>> +			   TRANSCODER_C_OFFSET, TRANSCODER_EDP_OFFSET }
>>>  
>>>  #define GEN_CHV_PIPEOFFSETS \
>>>  	.pipe_offsets = { PIPE_A_OFFSET, PIPE_B_OFFSET, \
>>>  			  CHV_PIPE_C_OFFSET }, \
>>>  	.trans_offsets = { TRANSCODER_A_OFFSET, TRANSCODER_B_OFFSET, \
>>> -			   CHV_TRANSCODER_C_OFFSET, } \
>>> +			   CHV_TRANSCODER_C_OFFSET }
>>>  
>>>  #define CURSOR_OFFSETS \
>>>  	.cursor_offsets = { CURSOR_A_OFFSET, CURSOR_B_OFFSET, CHV_CURSOR_C_OFFSET }
>>> -- 
>>> 2.11.0

-- 
Jani Nikula, Intel Open Source Graphics Center


More information about the Intel-gfx mailing list