[PATCH v2] gpu:drm: Remove duplicate headers

[Mukesh Ojha]

On 3/29/2019 12:32 AM, Jagadeesh Pagadala wrote:
> On Thu, Mar 28, 2019 at 04:12:10PM +0200, Laurent Pinchart wrote:
>> Hi Jagadeesh,
>>
>> On Thu, Mar 28, 2019 at 09:32:06PM +0530, Jagadeesh Pagadala wrote:
>>> On Thu, Mar 28, 2019 at 08:51:24AM +0200, Laurent Pinchart wrote:
>>>> On Thu, Mar 28, 2019 at 02:41:56AM +0530, jagdsh.linux at gmail.com wrote:
>>>>> From: Jagadeesh Pagadala <jagdsh.linux at gmail.com>
>>>>>
>>>>> Remove duplicate headers which are included twice.
>>>> Could you, while at it, also sort the existing #include statements
>>>> alphabetically ? This should help avoiding similar issues in the future.
>>>>
>>>>> Signed-off-by: Jagadeesh Pagadala <jagdsh.linux at gmail.com>


Reviewed-by: Mukesh Ojha <mojha at codeaurora.org>

-Mukesh

>>>>> ---
>>>>>   drivers/gpu/drm/bridge/panel.c       | 1 -
>>>>>   drivers/gpu/drm/i915/intel_display.c | 7 -------
>>>>>   2 files changed, 8 deletions(-)
>>>>>
>>>>> diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
>>>>> index 38eeaf8..eb9567d 100644
>>>>> --- a/drivers/gpu/drm/bridge/panel.c
>>>>> +++ b/drivers/gpu/drm/bridge/panel.c
>>>>> @@ -15,7 +15,6 @@
>>>>>   #include <drm/drm_encoder.h>
>>>>>   #include <drm/drm_modeset_helper_vtables.h>
>>>>>   #include <drm/drm_probe_helper.h>
>>>>> -#include <drm/drm_panel.h>
>>>>>   
>>>>>   struct panel_bridge {
>>>>>   	struct drm_bridge bridge;
>>>>> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>>>>> index ccb6163..1166342 100644
>>>>> --- a/drivers/gpu/drm/i915/intel_display.c
>>>>> +++ b/drivers/gpu/drm/i915/intel_display.c
>>>>> @@ -51,14 +51,7 @@
>>>>>   #include "intel_dsi.h"
>>>>>   #include "intel_frontbuffer.h"
>>>>>   
>>>>> -#include "intel_drv.h"
>>>>> -#include "intel_dsi.h"
>>>>> -#include "intel_frontbuffer.h"
>>>>> -
>>>>> -#include "i915_drv.h"
>>>>> -#include "i915_gem_clflush.h"
>>>>>   #include "i915_reset.h"
>>>>> -#include "i915_trace.h"
>>>>>   
>>>>>   /* Primary plane formats for gen <= 3 */
>>>>>   static const u32 i8xx_primary_formats[] = {
>>>  From c9a68b204fe4bb013c2b8481ca8239c957dd69cc Mon Sep 17 00:00:00 2001
>>> From: Jagadeesh Pagadala <jagdsh.linux at gmail.com>
>>> Date: Thu, 28 Mar 2019 21:20:12 +0530
>>> Subject: [PATCH] gpu:drm: sort the existing #includes alphabetically
>>>
>>> Hi Laurent,
>>>
>>> Hopefully this helps.
>> It does, thanks. If you squash it with your original patch and send a
>> v2, you can add my
>>
>> Reviewed-by: Laurent Pinchart <laurent.pinchart at ideasonboard.com>
>>
>>> Signed-off-by: Jagadeesh Pagadala <jagdsh.linux at gmail.com>
>>> ---
>>>   drivers/gpu/drm/bridge/panel.c       | 2 +-
>>>   drivers/gpu/drm/i915/intel_display.c | 4 ++--
>>>   2 files changed, 3 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c
>>> index eb9567d..000ba7c 100644
>>> --- a/drivers/gpu/drm/bridge/panel.c
>>> +++ b/drivers/gpu/drm/bridge/panel.c
>>> @@ -9,11 +9,11 @@
>>>    */
>>>   
>>>   #include <drm/drmP.h>
>>> -#include <drm/drm_panel.h>
>>>   #include <drm/drm_atomic_helper.h>
>>>   #include <drm/drm_connector.h>
>>>   #include <drm/drm_encoder.h>
>>>   #include <drm/drm_modeset_helper_vtables.h>
>>> +#include <drm/drm_panel.h>
>>>   #include <drm/drm_probe_helper.h>
>>>   
>>>   struct panel_bridge {
>>> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>>> index 1166342..7956e89 100644
>>> --- a/drivers/gpu/drm/i915/intel_display.c
>>> +++ b/drivers/gpu/drm/i915/intel_display.c
>>> @@ -46,13 +46,13 @@
>>>   
>>>   #include "i915_drv.h"
>>>   #include "i915_gem_clflush.h"
>>> +#include "i915_reset.h"
>>>   #include "i915_trace.h"
>>> +
>>>   #include "intel_drv.h"
>>>   #include "intel_dsi.h"
>>>   #include "intel_frontbuffer.h"
>>>   
>>> -#include "i915_reset.h"
>>> -
>>>   /* Primary plane formats for gen <= 3 */
>>>   static const u32 i8xx_primary_formats[] = {
>>>   	DRM_FORMAT_C8,
>> -- 
>> Regards,
>>
>> Laurent Pinchart