* [PATCH][Resend] Remove unneeded version.h includes (and add where needed) for drivers/usb/
@ 2011-08-01 21:33 Jesper Juhl
2011-08-02 21:19 ` Felipe Balbi
0 siblings, 1 reply; 6+ messages in thread
From: Jesper Juhl @ 2011-08-01 21:33 UTC (permalink / raw)
To: LKML
Cc: trivial, Felipe Balbi, Greg Kroah-Hartman, Matthew Dharm,
linux-usb, usb-storage, Laurent Pinchart
It was pointed out by 'make versioncheck' that linux/version.h was not
always being included where needed and sometimes included needlessly
in drivers/usb/.
This patch fixes up the includes.
For the UVC gadget driver bits, this was ACK'ed by Laurent Pinchart.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
drivers/usb/gadget/uvc.h | 1 +
drivers/usb/gadget/uvc_v4l2.c | 1 -
drivers/usb/storage/realtek_cr.c | 1 -
3 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/gadget/uvc.h b/drivers/usb/gadget/uvc.h
index 5b79194..81971fb 100644
--- a/drivers/usb/gadget/uvc.h
+++ b/drivers/usb/gadget/uvc.h
@@ -56,6 +56,7 @@ struct uvc_event
#include <linux/usb.h> /* For usb_endpoint_* */
#include <linux/usb/gadget.h>
#include <linux/videodev2.h>
+#include <linux/version.h>
#include <media/v4l2-fh.h>
#include "uvc_queue.h"
diff --git a/drivers/usb/gadget/uvc_v4l2.c b/drivers/usb/gadget/uvc_v4l2.c
index 52f8f9e..cfb5838 100644
--- a/drivers/usb/gadget/uvc_v4l2.c
+++ b/drivers/usb/gadget/uvc_v4l2.c
@@ -16,7 +16,6 @@
#include <linux/errno.h>
#include <linux/list.h>
#include <linux/mutex.h>
-#include <linux/version.h>
#include <linux/videodev2.h>
#include <linux/vmalloc.h>
#include <linux/wait.h>
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
index 34adc4b..6fd1306 100644
--- a/drivers/usb/storage/realtek_cr.c
+++ b/drivers/usb/storage/realtek_cr.c
@@ -25,7 +25,6 @@
#include <linux/kthread.h>
#include <linux/sched.h>
#include <linux/kernel.h>
-#include <linux/version.h>
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
--
1.7.6
--
Jesper Juhl <jj@chaosbits.net> http://www.chaosbits.net/
Don't top-post http://www.catb.org/jargon/html/T/top-post.html
Plain text mails only, please.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH][Resend] Remove unneeded version.h includes (and add where needed) for drivers/usb/
2011-08-01 21:33 [PATCH][Resend] Remove unneeded version.h includes (and add where needed) for drivers/usb/ Jesper Juhl
@ 2011-08-02 21:19 ` Felipe Balbi
2011-08-02 22:11 ` Laurent Pinchart
0 siblings, 1 reply; 6+ messages in thread
From: Felipe Balbi @ 2011-08-02 21:19 UTC (permalink / raw)
To: Jesper Juhl
Cc: LKML, trivial, Felipe Balbi, Greg Kroah-Hartman, Matthew Dharm,
linux-usb, usb-storage, Laurent Pinchart
[-- Attachment #1: Type: text/plain, Size: 1098 bytes --]
Hi,
On Mon, Aug 01, 2011 at 11:33:29PM +0200, Jesper Juhl wrote:
> It was pointed out by 'make versioncheck' that linux/version.h was not
> always being included where needed and sometimes included needlessly
> in drivers/usb/.
> This patch fixes up the includes.
>
> For the UVC gadget driver bits, this was ACK'ed by Laurent Pinchart.
>
> Signed-off-by: Jesper Juhl <jj@chaosbits.net>
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
> drivers/usb/gadget/uvc.h | 1 +
> drivers/usb/gadget/uvc_v4l2.c | 1 -
> drivers/usb/storage/realtek_cr.c | 1 -
> 3 files changed, 1 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/gadget/uvc.h b/drivers/usb/gadget/uvc.h
> index 5b79194..81971fb 100644
> --- a/drivers/usb/gadget/uvc.h
> +++ b/drivers/usb/gadget/uvc.h
> @@ -56,6 +56,7 @@ struct uvc_event
> #include <linux/usb.h> /* For usb_endpoint_* */
> #include <linux/usb/gadget.h>
> #include <linux/videodev2.h>
> +#include <linux/version.h>
does uvc.h really needs <linux/version.h> ?? Laurent ?
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH][Resend] Remove unneeded version.h includes (and add where needed) for drivers/usb/
2011-08-02 21:19 ` Felipe Balbi
@ 2011-08-02 22:11 ` Laurent Pinchart
2011-08-02 22:50 ` Felipe Balbi
0 siblings, 1 reply; 6+ messages in thread
From: Laurent Pinchart @ 2011-08-02 22:11 UTC (permalink / raw)
To: balbi
Cc: Jesper Juhl, LKML, trivial, Greg Kroah-Hartman, Matthew Dharm,
linux-usb, usb-storage
Hi Felipe,
On Tuesday 02 August 2011 23:19:24 Felipe Balbi wrote:
> On Mon, Aug 01, 2011 at 11:33:29PM +0200, Jesper Juhl wrote:
> > It was pointed out by 'make versioncheck' that linux/version.h was not
> > always being included where needed and sometimes included needlessly
> > in drivers/usb/.
> > This patch fixes up the includes.
> >
> > For the UVC gadget driver bits, this was ACK'ed by Laurent Pinchart.
> >
> > Signed-off-by: Jesper Juhl <jj@chaosbits.net>
> > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > ---
> >
> > drivers/usb/gadget/uvc.h | 1 +
> > drivers/usb/gadget/uvc_v4l2.c | 1 -
> > drivers/usb/storage/realtek_cr.c | 1 -
> > 3 files changed, 1 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/usb/gadget/uvc.h b/drivers/usb/gadget/uvc.h
> > index 5b79194..81971fb 100644
> > --- a/drivers/usb/gadget/uvc.h
> > +++ b/drivers/usb/gadget/uvc.h
> > @@ -56,6 +56,7 @@ struct uvc_event
> >
> > #include <linux/usb.h> /* For usb_endpoint_* */
> > #include <linux/usb/gadget.h>
> > #include <linux/videodev2.h>
> >
> > +#include <linux/version.h>
>
> does uvc.h really needs <linux/version.h> ?? Laurent ?
uvc.h has
#define DRIVER_VERSION_NUMBER KERNEL_VERSION(0, 1, 0)
This is used in drivers/usb/gadget/uvc_v4l2.c only.
As the uvc gadget driver lives in-tree, the best fix is probably to remove
DRIVER_VERSION_NUMBER completely, and replace it with LINUX_VERSION_CODE where
it is used.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH][Resend] Remove unneeded version.h includes (and add where needed) for drivers/usb/
2011-08-02 22:11 ` Laurent Pinchart
@ 2011-08-02 22:50 ` Felipe Balbi
2011-08-03 8:18 ` Laurent Pinchart
0 siblings, 1 reply; 6+ messages in thread
From: Felipe Balbi @ 2011-08-02 22:50 UTC (permalink / raw)
To: Laurent Pinchart
Cc: balbi, Jesper Juhl, LKML, trivial, Greg Kroah-Hartman,
Matthew Dharm, linux-usb, usb-storage
[-- Attachment #1: Type: text/plain, Size: 1903 bytes --]
Hi Laurent,
On Wed, Aug 03, 2011 at 12:11:53AM +0200, Laurent Pinchart wrote:
> Hi Felipe,
>
> On Tuesday 02 August 2011 23:19:24 Felipe Balbi wrote:
> > On Mon, Aug 01, 2011 at 11:33:29PM +0200, Jesper Juhl wrote:
> > > It was pointed out by 'make versioncheck' that linux/version.h was not
> > > always being included where needed and sometimes included needlessly
> > > in drivers/usb/.
> > > This patch fixes up the includes.
> > >
> > > For the UVC gadget driver bits, this was ACK'ed by Laurent Pinchart.
> > >
> > > Signed-off-by: Jesper Juhl <jj@chaosbits.net>
> > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > ---
> > >
> > > drivers/usb/gadget/uvc.h | 1 +
> > > drivers/usb/gadget/uvc_v4l2.c | 1 -
> > > drivers/usb/storage/realtek_cr.c | 1 -
> > > 3 files changed, 1 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/usb/gadget/uvc.h b/drivers/usb/gadget/uvc.h
> > > index 5b79194..81971fb 100644
> > > --- a/drivers/usb/gadget/uvc.h
> > > +++ b/drivers/usb/gadget/uvc.h
> > > @@ -56,6 +56,7 @@ struct uvc_event
> > >
> > > #include <linux/usb.h> /* For usb_endpoint_* */
> > > #include <linux/usb/gadget.h>
> > > #include <linux/videodev2.h>
> > >
> > > +#include <linux/version.h>
> >
> > does uvc.h really needs <linux/version.h> ?? Laurent ?
>
> uvc.h has
>
> #define DRIVER_VERSION_NUMBER KERNEL_VERSION(0, 1, 0)
>
> This is used in drivers/usb/gadget/uvc_v4l2.c only.
>
> As the uvc gadget driver lives in-tree, the best fix is probably to remove
> DRIVER_VERSION_NUMBER completely, and replace it with LINUX_VERSION_CODE where
> it is used.
yeah, I can agree with that, but do you need a MODULE_VERSION() anyway ?
Would it be better to just remove the MODULE_VERSION altogether as
there's no real benefit from having it ?
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH][Resend] Remove unneeded version.h includes (and add where needed) for drivers/usb/
2011-08-02 22:50 ` Felipe Balbi
@ 2011-08-03 8:18 ` Laurent Pinchart
2011-08-03 10:03 ` Felipe Balbi
0 siblings, 1 reply; 6+ messages in thread
From: Laurent Pinchart @ 2011-08-03 8:18 UTC (permalink / raw)
To: balbi
Cc: Jesper Juhl, LKML, trivial, Greg Kroah-Hartman, Matthew Dharm,
linux-usb, usb-storage
Hi Felipe,
On Wednesday 03 August 2011 00:50:42 Felipe Balbi wrote:
> On Wed, Aug 03, 2011 at 12:11:53AM +0200, Laurent Pinchart wrote:
> > On Tuesday 02 August 2011 23:19:24 Felipe Balbi wrote:
> > > On Mon, Aug 01, 2011 at 11:33:29PM +0200, Jesper Juhl wrote:
> > > > It was pointed out by 'make versioncheck' that linux/version.h was
> > > > not always being included where needed and sometimes included
> > > > needlessly in drivers/usb/.
> > > > This patch fixes up the includes.
> > > >
> > > > For the UVC gadget driver bits, this was ACK'ed by Laurent Pinchart.
> > > >
> > > > Signed-off-by: Jesper Juhl <jj@chaosbits.net>
> > > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > > ---
> > > >
> > > > drivers/usb/gadget/uvc.h | 1 +
> > > > drivers/usb/gadget/uvc_v4l2.c | 1 -
> > > > drivers/usb/storage/realtek_cr.c | 1 -
> > > > 3 files changed, 1 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/drivers/usb/gadget/uvc.h b/drivers/usb/gadget/uvc.h
> > > > index 5b79194..81971fb 100644
> > > > --- a/drivers/usb/gadget/uvc.h
> > > > +++ b/drivers/usb/gadget/uvc.h
> > > > @@ -56,6 +56,7 @@ struct uvc_event
> > > >
> > > > #include <linux/usb.h> /* For usb_endpoint_* */
> > > > #include <linux/usb/gadget.h>
> > > > #include <linux/videodev2.h>
> > > >
> > > > +#include <linux/version.h>
> > >
> > > does uvc.h really needs <linux/version.h> ?? Laurent ?
> >
> > uvc.h has
> >
> > #define DRIVER_VERSION_NUMBER KERNEL_VERSION(0, 1, 0)
> >
> > This is used in drivers/usb/gadget/uvc_v4l2.c only.
> >
> > As the uvc gadget driver lives in-tree, the best fix is probably to
> > remove DRIVER_VERSION_NUMBER completely, and replace it with
> > LINUX_VERSION_CODE where it is used.
>
> yeah, I can agree with that, but do you need a MODULE_VERSION() anyway ?
> Would it be better to just remove the MODULE_VERSION altogether as
> there's no real benefit from having it ?
DRIVER_VERSION_NUMBER isn't used as a MODULE_VERSION() argument. The driver
uses it to report its version through the V4L2 API.
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH][Resend] Remove unneeded version.h includes (and add where needed) for drivers/usb/
2011-08-03 8:18 ` Laurent Pinchart
@ 2011-08-03 10:03 ` Felipe Balbi
0 siblings, 0 replies; 6+ messages in thread
From: Felipe Balbi @ 2011-08-03 10:03 UTC (permalink / raw)
To: Laurent Pinchart
Cc: balbi, Jesper Juhl, LKML, trivial, Greg Kroah-Hartman,
Matthew Dharm, linux-usb, usb-storage
[-- Attachment #1: Type: text/plain, Size: 2355 bytes --]
Hi,
On Wed, Aug 03, 2011 at 10:18:23AM +0200, Laurent Pinchart wrote:
> On Wednesday 03 August 2011 00:50:42 Felipe Balbi wrote:
> > On Wed, Aug 03, 2011 at 12:11:53AM +0200, Laurent Pinchart wrote:
> > > On Tuesday 02 August 2011 23:19:24 Felipe Balbi wrote:
> > > > On Mon, Aug 01, 2011 at 11:33:29PM +0200, Jesper Juhl wrote:
> > > > > It was pointed out by 'make versioncheck' that linux/version.h was
> > > > > not always being included where needed and sometimes included
> > > > > needlessly in drivers/usb/.
> > > > > This patch fixes up the includes.
> > > > >
> > > > > For the UVC gadget driver bits, this was ACK'ed by Laurent Pinchart.
> > > > >
> > > > > Signed-off-by: Jesper Juhl <jj@chaosbits.net>
> > > > > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> > > > > ---
> > > > >
> > > > > drivers/usb/gadget/uvc.h | 1 +
> > > > > drivers/usb/gadget/uvc_v4l2.c | 1 -
> > > > > drivers/usb/storage/realtek_cr.c | 1 -
> > > > > 3 files changed, 1 insertions(+), 2 deletions(-)
> > > > >
> > > > > diff --git a/drivers/usb/gadget/uvc.h b/drivers/usb/gadget/uvc.h
> > > > > index 5b79194..81971fb 100644
> > > > > --- a/drivers/usb/gadget/uvc.h
> > > > > +++ b/drivers/usb/gadget/uvc.h
> > > > > @@ -56,6 +56,7 @@ struct uvc_event
> > > > >
> > > > > #include <linux/usb.h> /* For usb_endpoint_* */
> > > > > #include <linux/usb/gadget.h>
> > > > > #include <linux/videodev2.h>
> > > > >
> > > > > +#include <linux/version.h>
> > > >
> > > > does uvc.h really needs <linux/version.h> ?? Laurent ?
> > >
> > > uvc.h has
> > >
> > > #define DRIVER_VERSION_NUMBER KERNEL_VERSION(0, 1, 0)
> > >
> > > This is used in drivers/usb/gadget/uvc_v4l2.c only.
> > >
> > > As the uvc gadget driver lives in-tree, the best fix is probably to
> > > remove DRIVER_VERSION_NUMBER completely, and replace it with
> > > LINUX_VERSION_CODE where it is used.
> >
> > yeah, I can agree with that, but do you need a MODULE_VERSION() anyway ?
> > Would it be better to just remove the MODULE_VERSION altogether as
> > there's no real benefit from having it ?
>
> DRIVER_VERSION_NUMBER isn't used as a MODULE_VERSION() argument. The driver
> uses it to report its version through the V4L2 API.
ahaa, ok. fine by me then.
--
balbi
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 490 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-08-03 10:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-01 21:33 [PATCH][Resend] Remove unneeded version.h includes (and add where needed) for drivers/usb/ Jesper Juhl
2011-08-02 21:19 ` Felipe Balbi
2011-08-02 22:11 ` Laurent Pinchart
2011-08-02 22:50 ` Felipe Balbi
2011-08-03 8:18 ` Laurent Pinchart
2011-08-03 10:03 ` Felipe Balbi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®