Em Fri, 17 Nov 2017 15:18:26 +0100
Greg Kroah-Hartman <[email protected]> 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 <[email protected]>
> Cc: Mauro Carvalho Chehab <[email protected]>
> Cc: Johan Hovold <[email protected]>
> Cc: Davidlohr Bueso <[email protected]>
> Cc: Sakari Ailus <[email protected]>
> Reported-by: Philippe Ombredanne <[email protected]>
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
> ---
> 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");
Regard
Thanks,
Mauro
From 1584352828798672390@xxx Fri Nov 17 22:10:00 +0000 2017
X-GM-THRID: 1584342085865135600
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread
On Fri, Nov 17, 2017 at 12:58:47PM -0200, Mauro Carvalho Chehab wrote:
> Em Fri, 17 Nov 2017 15:18:26 +0100
> Greg Kroah-Hartman <[email protected]> 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 <[email protected]>
> > Cc: Mauro Carvalho Chehab <[email protected]>
> > Cc: Johan Hovold <[email protected]>
> > Cc: Davidlohr Bueso <[email protected]>
> > Cc: Sakari Ailus <[email protected]>
> > Reported-by: Philippe Ombredanne <[email protected]>
> > Signed-off-by: Greg Kroah-Hartman <[email protected]>
> > ---
> > 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");
As Philippe points out, the original marking is correct.
Once we get SPDX tags on all of the kernel files, mis-matches, if they
are present, will be obvious to check for and fix up. Which is why I
have submitted this patch :)
thanks,
greg k-h
From 1584342260220100359@xxx Fri Nov 17 19:22:01 +0000 2017
X-GM-THRID: 1584342085865135600
X-Gmail-Labels: Inbox,Category Forums,HistoricalUnread