On Fri, Nov 17, 2017 at 03:01:02PM -0200, Mauro Carvalho Chehab wrote:
> Em Fri, 17 Nov 2017 16:01:41 +0100
> Philippe Ombredanne <pombredanne@xxxxxxxx> escreveu:
>
> > On Fri, Nov 17, 2017 at 3:58 PM, Mauro Carvalho Chehab
> > <mchehab@xxxxxxxxxxxxxxxx> wrote:
> > > Em Fri, 17 Nov 2017 15:18:26 +0100
> > > Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> escreveu:
> > >
> > >> There is no need to #define the license of the driver, just put it in
> > >> the MODULE_LICENSE() line directly as a text string.
> > >>
> > >> This allows tools that check that the module license matches the source
> > >> code license to work properly, as there is no need to unwind the
> > >> unneeded dereference.
> > >>
> > >> Cc: Hans Verkuil <hverkuil@xxxxxxxxx>
> > >> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
> > >> Cc: Johan Hovold <johan@xxxxxxxxxx>
> > >> Cc: Davidlohr Bueso <dave@xxxxxxxxxxxx>
> > >> Cc: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx>
> > >> Reported-by: Philippe Ombredanne <pombredanne@xxxxxxxx>
> > >> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
>
> Acked-by: Mauro Carvalho Chehab <mchehab@xxxxxxxxxx>
>
> > >> ---
> > >> drivers/media/usb/usbvision/usbvision-video.c | 3 +--
> > >> 1 file changed, 1 insertion(+), 2 deletions(-)
> > >>
> > >> diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c
> > >> index 960272d3c924..0f5954a1fea2 100644
> > >> --- a/drivers/media/usb/usbvision/usbvision-video.c
> > >> +++ b/drivers/media/usb/usbvision/usbvision-video.c
> > >> @@ -72,7 +72,6 @@
> > >> #define DRIVER_NAME "usbvision"
> > >> #define DRIVER_ALIAS "USBVision"
> > >> #define DRIVER_DESC "USBVision USB Video Device Driver for Linux"
> > >> -#define DRIVER_LICENSE "GPL"
> > >> #define USBVISION_VERSION_STRING "0.9.11"
> > >>
> > >> #define ENABLE_HEXDUMP 0 /* Enable if you need it */
> > >> @@ -141,7 +140,7 @@ MODULE_PARM_DESC(radio_nr, "Set radio device number (/dev/radioX). Default: -1
> > >> /* Misc stuff */
> > >> MODULE_AUTHOR(DRIVER_AUTHOR);
> > >> MODULE_DESCRIPTION(DRIVER_DESC);
> > >> -MODULE_LICENSE(DRIVER_LICENSE);
> > >> +MODULE_LICENSE("GPL");
> > >
> > > Makes sense to me, but, if we look at the header of this file:
> > >
> > > * This program is free software; you can redistribute it and/or modify
> > > * it under the terms of the GNU General Public License as published by
> > > * the Free Software Foundation; either version 2 of the License, or
> > > * (at your option) any later version.
> > >
> > > Its license is actually GPL 2.0+
> > >
> > > So, I would actually change it to:
> > >
> > > MODULE_LICENSE("GPL v2");
> >
> > Mauro:
> >
> > actually even if it sounds weird the module.h doc [1] is clear on this topic:
> >
> > * "GPL" [GNU Public License v2 or later]
> > * "GPL v2" [GNU Public License v2]
> >
> > So it should be "GPL" IMHO.
> >
> >
> > [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/include/linux/module.h?id=refs/tags/v4.10#n175
> >
>
> Oh! Yeah, you're right. I would add that on the Kernel documentation
> somewhere, perhaps with the new document that Thomas is writing
> about SPFX.
>
> The Documentation/kernel-hacking/hacking.rst doc mentions
> MODULE_LICENSE, but doesn't define the expected values for it.
It's buried in the code comments in include/linux/module.h. One of
these days I want to just make a #define for the licenses that makes it
a bit more obvious what each should be, but for now, we have lots of
other things to clean up before dealing with this :)
thanks,
greg k-h
