[-next] drm/i915/audio: remove duplicated include from intel_audio.c

Commit Message

[e-mail] April 16, 2015, 1:11 p.m. UTC

From: Wei Yongjun <[e-mail]>

Remove duplicated include.

Signed-off-by: Wei Yongjun <[e-mail]>
---
 drivers/gpu/drm/i915/intel_audio.c | 1 -
 1 file changed, 1 deletion(-)

Comments

Daniel Vetter April 16, 2015, 2:30 p.m. UTC | #1

On Thu, Apr 16, 2015 at 09:11:08PM +0800, [e-mail] wrote:
> From: Wei Yongjun <[e-mail]>
> 
> Remove duplicated include.
> 
> Signed-off-by: Wei Yongjun <[e-mail]>

Queued for -next, thanks for the patch.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_audio.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
> index 2396cc7..d00d488 100644
> --- a/drivers/gpu/drm/i915/intel_audio.c
> +++ b/drivers/gpu/drm/i915/intel_audio.c
> @@ -28,7 +28,6 @@
>  
>  #include <drm/drmP.h>
>  #include <drm/drm_edid.h>
> -#include "intel_drv.h"
>  #include "i915_drv.h"
>  
>  /**
> 
> _______________________________________________
> Intel-gfx mailing list
> [e-mail]
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

John Hunter April 22, 2015, 2:30 a.m. UTC | #2

Hi,

I think maybe we should remove both of the two lines:
#include "intel_drv.h"
#include "i915_drv.h"
Because we have* two* "intel_drv.h" and *one* "i915_drv.h", and
"i915_drv.h" has already been included in the "intel_drv.h".

I not sure whether i am right. If you need me to do the patch,
let me know.


On Thu, Apr 16, 2015 at 10:30 PM, Daniel Vetter <[e-mail]> wrote:

> On Thu, Apr 16, 2015 at 09:11:08PM +0800, [e-mail] wrote:
> > From: Wei Yongjun <[e-mail]>
> >
> > Remove duplicated include.
> >
> > Signed-off-by: Wei Yongjun <[e-mail]>
>
> Queued for -next, thanks for the patch.
> -Daniel
>
> > ---
> >  drivers/gpu/drm/i915/intel_audio.c | 1 -
> >  1 file changed, 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_audio.c
> b/drivers/gpu/drm/i915/intel_audio.c
> > index 2396cc7..d00d488 100644
> > --- a/drivers/gpu/drm/i915/intel_audio.c
> > +++ b/drivers/gpu/drm/i915/intel_audio.c
> > @@ -28,7 +28,6 @@
> >
> >  #include <drm/drmP.h>
> >  #include <drm/drm_edid.h>
> > -#include "intel_drv.h"
> >  #include "i915_drv.h"
> >
> >  /**
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > [e-mail]
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
> _______________________________________________
> dri-devel mailing list
> [e-mail]
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>

[e-mail] April 22, 2015, 2:35 a.m. UTC | #3

Hi John,

Feel free to submit a new patch.

Regards,
Yongjun Wei

From: John Hunter [mailto:[e-mail]]

Sent: 2015?4?22? 10:30
To: [e-mail]; Daniel Vetter; Jani Nikula; David Airlie; Yongjun Wei (RD-CN); [e-mail]; [e-mail]; open list
Subject: Re: [Intel-gfx] [PATCH -next] drm/i915/audio: remove duplicated include from intel_audio.c

Hi,

I think maybe we should remove both of the two lines:
#include "intel_drv.h"
#include "i915_drv.h"
Because we have two "intel_drv.h" and one "i915_drv.h", and
"i915_drv.h" has already been included in the "intel_drv.h".

I not sure whether i am right. If you need me to do the patch,
let me know.


On Thu, Apr 16, 2015 at 10:30 PM, Daniel Vetter <[e-mail]<mailto:[e-mail]>> wrote:
On Thu, Apr 16, 2015 at 09:11:08PM +0800, [e-mail]<mailto:[e-mail]> wrote:
> From: Wei Yongjun <[e-mail]<mailto:[e-mail]>>

>

> Remove duplicated include.

>

> Signed-off-by: Wei Yongjun <[e-mail]<mailto:[e-mail]>>


Queued for -next, thanks for the patch.
-Daniel

> ---

>  drivers/gpu/drm/i915/intel_audio.c | 1 -

>  1 file changed, 1 deletion(-)

>

> diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c

> index 2396cc7..d00d488 100644

> --- a/drivers/gpu/drm/i915/intel_audio.c

> +++ b/drivers/gpu/drm/i915/intel_audio.c

> @@ -28,7 +28,6 @@

>

>  #include <drm/drmP.h>

>  #include <drm/drm_edid.h>

> -#include "intel_drv.h"

>  #include "i915_drv.h"

>

>  /**

>

> _______________________________________________

> Intel-gfx mailing list

> [e-mail]<mailto:[e-mail]>

> http://lists.freedesktop.org/mailman/listinfo/intel-gfx


--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
[e-mail]<mailto:[e-mail]>
http://lists.freedesktop.org/mailman/listinfo/dri-devel



--
Best regards
Junwang Zhao
Microprocessor Research and Develop Center
Department of Computer Science &Technology
Peking University
Beijing, 100871, PRC

=======================================================

This message has been analyzed by Deep Discovery Email Inspector.



<table class="TM_EMAIL_NOTICE"><tr><td><pre>
TREND MICRO EMAIL NOTICE
The information contained in this email and any attachments is confidential 
and may be subject to copyright or other intellectual property protection. 
If you are not the intended recipient, you are not authorized to use or 
disclose this information, and we request that you notify us by reply mail or
telephone and delete the original message from your mail system.
</pre></td></tr></table>

John Hunter April 22, 2015, 2:50 a.m. UTC | #4

Sure, but I need Daniel to admit that, because maybe include the two header
file make it easier to understand.
And after checked other files in drm/i915, I found that a lot other file do
the
same thing(include both header file). So I will just wait Daniel to wait up
and
give me the order :-)

On Wed, Apr 22, 2015 at 10:35 AM, [e-mail] <
[e-mail]> wrote:

>  Hi John,
>
>
>
> Feel free to submit a new patch.
>
>
>
> Regards,
>
> Yongjun Wei
>
>
>
> *From:* John Hunter [mailto:[e-mail]]
> *Sent:* 2015?4?22? 10:30
> *To:* [e-mail]; Daniel Vetter; Jani Nikula; David Airlie; Yongjun
> Wei (RD-CN); [e-mail];
> [e-mail]; open list
> *Subject:* Re: [Intel-gfx] [PATCH -next] drm/i915/audio: remove
> duplicated include from intel_audio.c
>
>
>
> Hi,
>
>
>
> I think maybe we should remove both of the two lines:
>
> #include "intel_drv.h"
>
> #include "i915_drv.h"
>
> Because we have* two* "intel_drv.h" and *one* "i915_drv.h", and
>
> "i915_drv.h" has already been included in the "intel_drv.h".
>
>
>
> I not sure whether i am right. If you need me to do the patch,
>
> let me know.
>
>
>
>
>
> On Thu, Apr 16, 2015 at 10:30 PM, Daniel Vetter <[e-mail]> wrote:
>
> On Thu, Apr 16, 2015 at 09:11:08PM +0800, [e-mail] wrote:
> > From: Wei Yongjun <[e-mail]>
> >
> > Remove duplicated include.
> >
> > Signed-off-by: Wei Yongjun <[e-mail]>
>
> Queued for -next, thanks for the patch.
> -Daniel
>
> > ---
> >  drivers/gpu/drm/i915/intel_audio.c | 1 -
> >  1 file changed, 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/i915/intel_audio.c
> b/drivers/gpu/drm/i915/intel_audio.c
> > index 2396cc7..d00d488 100644
> > --- a/drivers/gpu/drm/i915/intel_audio.c
> > +++ b/drivers/gpu/drm/i915/intel_audio.c
> > @@ -28,7 +28,6 @@
> >
> >  #include <drm/drmP.h>
> >  #include <drm/drm_edid.h>
> > -#include "intel_drv.h"
> >  #include "i915_drv.h"
> >
> >  /**
> >
> > _______________________________________________
> > Intel-gfx mailing list
> > [e-mail]
> > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
>
> _______________________________________________
> dri-devel mailing list
> [e-mail]
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>
>
>
>
>
> --
>
> Best regards
>
> Junwang Zhao
>
> Microprocessor Research and Develop Center
>
> Department of Computer Science &Technology
>
> Peking University
>
> Beijing, 100871, PRC
>
> =======================================================
>
> This message has been analyzed by Deep Discovery Email Inspector.
>
>
>
> TREND MICRO EMAIL NOTICE
> The information contained in this email and any attachments is confidential
> and may be subject to copyright or other intellectual property protection.
> If you are not the intended recipient, you are not authorized to use or
> disclose this information, and we request that you notify us by reply mail or
> telephone and delete the original message from your mail system.
>
>

Daniel Vetter April 23, 2015, 4:09 p.m. UTC | #5

On Wed, Apr 22, 2015 at 10:50:55AM +0800, John Hunter wrote:
> Sure, but I need Daniel to admit that, because maybe include the two header
> file make it easier to understand.
> And after checked other files in drm/i915, I found that a lot other file do
> the
> same thing(include both header file). So I will just wait Daniel to wait up
> and
> give me the order :-)

drm/i915 headers are a bit a chaos anyway, so I'm not sure how useful that
would be really. And generally the trend in linux (and drm) is to have
split-up headers, so moving everyone to just include intel_drv.h would be
the "wrong" direction.

tbh I just don't have an opinion really ;-)
-Daniel

> 
> On Wed, Apr 22, 2015 at 10:35 AM, [e-mail] <
> [e-mail]> wrote:
> 
> >  Hi John,
> >
> >
> >
> > Feel free to submit a new patch.
> >
> >
> >
> > Regards,
> >
> > Yongjun Wei
> >
> >
> >
> > *From:* John Hunter [mailto:[e-mail]]
> > *Sent:* 2015?4?22? 10:30
> > *To:* [e-mail]; Daniel Vetter; Jani Nikula; David Airlie; Yongjun
> > Wei (RD-CN); [e-mail];
> > [e-mail]; open list
> > *Subject:* Re: [Intel-gfx] [PATCH -next] drm/i915/audio: remove
> > duplicated include from intel_audio.c
> >
> >
> >
> > Hi,
> >
> >
> >
> > I think maybe we should remove both of the two lines:
> >
> > #include "intel_drv.h"
> >
> > #include "i915_drv.h"
> >
> > Because we have* two* "intel_drv.h" and *one* "i915_drv.h", and
> >
> > "i915_drv.h" has already been included in the "intel_drv.h".
> >
> >
> >
> > I not sure whether i am right. If you need me to do the patch,
> >
> > let me know.
> >
> >
> >
> >
> >
> > On Thu, Apr 16, 2015 at 10:30 PM, Daniel Vetter <[e-mail]> wrote:
> >
> > On Thu, Apr 16, 2015 at 09:11:08PM +0800, [e-mail] wrote:
> > > From: Wei Yongjun <[e-mail]>
> > >
> > > Remove duplicated include.
> > >
> > > Signed-off-by: Wei Yongjun <[e-mail]>
> >
> > Queued for -next, thanks for the patch.
> > -Daniel
> >
> > > ---
> > >  drivers/gpu/drm/i915/intel_audio.c | 1 -
> > >  1 file changed, 1 deletion(-)
> > >
> > > diff --git a/drivers/gpu/drm/i915/intel_audio.c
> > b/drivers/gpu/drm/i915/intel_audio.c
> > > index 2396cc7..d00d488 100644
> > > --- a/drivers/gpu/drm/i915/intel_audio.c
> > > +++ b/drivers/gpu/drm/i915/intel_audio.c
> > > @@ -28,7 +28,6 @@
> > >
> > >  #include <drm/drmP.h>
> > >  #include <drm/drm_edid.h>
> > > -#include "intel_drv.h"
> > >  #include "i915_drv.h"
> > >
> > >  /**
> > >
> > > _______________________________________________
> > > Intel-gfx mailing list
> > > [e-mail]
> > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> >
> > --
> > Daniel Vetter
> > Software Engineer, Intel Corporation
> > http://blog.ffwll.ch
> >
> > _______________________________________________
> > dri-devel mailing list
> > [e-mail]
> > http://lists.freedesktop.org/mailman/listinfo/dri-devel
> >
> >
> >
> >
> >
> > --
> >
> > Best regards
> >
> > Junwang Zhao
> >
> > Microprocessor Research and Develop Center
> >
> > Department of Computer Science &Technology
> >
> > Peking University
> >
> > Beijing, 100871, PRC
> >
> > =======================================================
> >
> > This message has been analyzed by Deep Discovery Email Inspector.
> >
> >
> >
> > TREND MICRO EMAIL NOTICE
> > The information contained in this email and any attachments is confidential
> > and may be subject to copyright or other intellectual property protection.
> > If you are not the intended recipient, you are not authorized to use or
> > disclose this information, and we request that you notify us by reply mail or
> > telephone and delete the original message from your mail system.
> >
> >
> 
> 
> -- 
> Best regards
> Junwang Zhao
> Microprocessor Research and Develop Center
> Department of Computer Science &Technology
> Peking University
> Beijing, 100871, PRC

> _______________________________________________
> dri-devel mailing list
> [e-mail]
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

John Hunter April 24, 2015, 12:54 a.m. UTC | #6

ok, let's keep it the the original way.

On Fri, Apr 24, 2015 at 12:09 AM, Daniel Vetter <[e-mail]> wrote:

> On Wed, Apr 22, 2015 at 10:50:55AM +0800, John Hunter wrote:
> > Sure, but I need Daniel to admit that, because maybe include the two
> header
> > file make it easier to understand.
> > And after checked other files in drm/i915, I found that a lot other file
> do
> > the
> > same thing(include both header file). So I will just wait Daniel to wait
> up
> > and
> > give me the order :-)
>
> drm/i915 headers are a bit a chaos anyway, so I'm not sure how useful that
> would be really. And generally the trend in linux (and drm) is to have
> split-up headers, so moving everyone to just include intel_drv.h would be
> the "wrong" direction.
>
> tbh I just don't have an opinion really ;-)
> -Daniel
>
> >
> > On Wed, Apr 22, 2015 at 10:35 AM, [e-mail] <
> > [e-mail]> wrote:
> >
> > >  Hi John,
> > >
> > >
> > >
> > > Feel free to submit a new patch.
> > >
> > >
> > >
> > > Regards,
> > >
> > > Yongjun Wei
> > >
> > >
> > >
> > > *From:* John Hunter [mailto:[e-mail]]
> > > *Sent:* 2015?4?22? 10:30
> > > *To:* [e-mail]; Daniel Vetter; Jani Nikula; David Airlie;
> Yongjun
> > > Wei (RD-CN); [e-mail];
> > > [e-mail]; open list
> > > *Subject:* Re: [Intel-gfx] [PATCH -next] drm/i915/audio: remove
> > > duplicated include from intel_audio.c
> > >
> > >
> > >
> > > Hi,
> > >
> > >
> > >
> > > I think maybe we should remove both of the two lines:
> > >
> > > #include "intel_drv.h"
> > >
> > > #include "i915_drv.h"
> > >
> > > Because we have* two* "intel_drv.h" and *one* "i915_drv.h", and
> > >
> > > "i915_drv.h" has already been included in the "intel_drv.h".
> > >
> > >
> > >
> > > I not sure whether i am right. If you need me to do the patch,
> > >
> > > let me know.
> > >
> > >
> > >
> > >
> > >
> > > On Thu, Apr 16, 2015 at 10:30 PM, Daniel Vetter <[e-mail]>
> wrote:
> > >
> > > On Thu, Apr 16, 2015 at 09:11:08PM +0800, [e-mail] wrote:
> > > > From: Wei Yongjun <[e-mail]>
> > > >
> > > > Remove duplicated include.
> > > >
> > > > Signed-off-by: Wei Yongjun <[e-mail]>
> > >
> > > Queued for -next, thanks for the patch.
> > > -Daniel
> > >
> > > > ---
> > > >  drivers/gpu/drm/i915/intel_audio.c | 1 -
> > > >  1 file changed, 1 deletion(-)
> > > >
> > > > diff --git a/drivers/gpu/drm/i915/intel_audio.c
> > > b/drivers/gpu/drm/i915/intel_audio.c
> > > > index 2396cc7..d00d488 100644
> > > > --- a/drivers/gpu/drm/i915/intel_audio.c
> > > > +++ b/drivers/gpu/drm/i915/intel_audio.c
> > > > @@ -28,7 +28,6 @@
> > > >
> > > >  #include <drm/drmP.h>
> > > >  #include <drm/drm_edid.h>
> > > > -#include "intel_drv.h"
> > > >  #include "i915_drv.h"
> > > >
> > > >  /**
> > > >
> > > > _______________________________________________
> > > > Intel-gfx mailing list
> > > > [e-mail]
> > > > http://lists.freedesktop.org/mailman/listinfo/intel-gfx
> > >
> > > --
> > > Daniel Vetter
> > > Software Engineer, Intel Corporation
> > > http://blog.ffwll.ch
> > >
> > > _______________________________________________
> > > dri-devel mailing list
> > > [e-mail]
> > > http://lists.freedesktop.org/mailman/listinfo/dri-devel
> > >
> > >
> > >
> > >
> > >
> > > --
> > >
> > > Best regards
> > >
> > > Junwang Zhao
> > >
> > > Microprocessor Research and Develop Center
> > >
> > > Department of Computer Science &Technology
> > >
> > > Peking University
> > >
> > > Beijing, 100871, PRC
> > >
> > > =======================================================
> > >
> > > This message has been analyzed by Deep Discovery Email Inspector.
> > >
> > >
> > >
> > > TREND MICRO EMAIL NOTICE
> > > The information contained in this email and any attachments is
> confidential
> > > and may be subject to copyright or other intellectual property
> protection.
> > > If you are not the intended recipient, you are not authorized to use or
> > > disclose this information, and we request that you notify us by reply
> mail or
> > > telephone and delete the original message from your mail system.
> > >
> > >
> >
> >
> > --
> > Best regards
> > Junwang Zhao
> > Microprocessor Research and Develop Center
> > Department of Computer Science &Technology
> > Peking University
> > Beijing, 100871, PRC
>
> > _______________________________________________
> > dri-devel mailing list
> > [e-mail]
> > http://lists.freedesktop.org/mailman/listinfo/dri-devel
>
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch
>

Patch

diff --git a/drivers/gpu/drm/i915/intel_audio.c b/drivers/gpu/drm/i915/intel_audio.c
index 2396cc7..d00d488 100644
--- a/drivers/gpu/drm/i915/intel_audio.c
+++ b/drivers/gpu/drm/i915/intel_audio.c
@@ -28,7 +28,6 @@ 
 
 #include <drm/drmP.h>
 #include <drm/drm_edid.h>
-#include "intel_drv.h"
 #include "i915_drv.h"
 
 /**