public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] media: usbvision: remove unneeded DRIVER_LICENSE #define
@ 2017-11-17 14:18 Greg Kroah-Hartman
  2017-11-17 14:32 ` Hans Verkuil
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Greg Kroah-Hartman @ 2017-11-17 14:18 UTC (permalink / raw)
  To: Hans Verkuil, Mauro Carvalho Chehab
  Cc: Johan Hovold, Davidlohr Bueso, Sakari Ailus, linux-media,
	linux-kernel, Philippe Ombredanne

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@xs4all.nl>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Johan Hovold <johan@kernel.org>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Sakari Ailus <sakari.ailus@linux.intel.com>
Reported-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 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");
 MODULE_VERSION(USBVISION_VERSION_STRING);
 MODULE_ALIAS(DRIVER_ALIAS);
 
-- 
2.15.0

^ permalink raw reply related	[flat|nested] 10+ messages in thread
* Re: [PATCH] media: usbvision: remove unneeded DRIVER_LICENSE #define
@ 2017-11-17 17:26 Philippe Ombredanne
  2017-11-18 10:29 ` Greg Kroah-Hartman
  0 siblings, 1 reply; 10+ messages in thread
From: Philippe Ombredanne @ 2017-11-17 17:26 UTC (permalink / raw)
  To: Thomas Gleixner, Mauro Carvalho Chehab
  Cc: Greg Kroah-Hartman, Hans Verkuil, Mauro Carvalho Chehab,
	Johan Hovold, Davidlohr Bueso, Sakari Ailus,
	Linux Media Mailing List, LKML

On Fri, Nov 17, 2017 at 6:01 PM, Mauro Carvalho Chehab
<mchehab@s-opensource.com> wrote:
> Em Fri, 17 Nov 2017 16:01:41 +0100
> Philippe Ombredanne <pombredanne@nexb.com> escreveu:
>
>> On Fri, Nov 17, 2017 at 3:58 PM, Mauro Carvalho Chehab
>> <mchehab@s-opensource.com> wrote:
>> > Em Fri, 17 Nov 2017 15:18:26 +0100
>> > Greg Kroah-Hartman <gregkh@linuxfoundation.org> escreveu:
>> >
>> > 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.


Good point!

Thomas:
Is this something that should be taken care of?
If yes, I may be able take a crack at it sometimes next week.

unless...

Mauro:
if you have a docwriter soul and want to make a good deed for the
holidays, may you feel like starting a doc patch? :P

e.g. something along the lines:

"Here are the valid values for MODULE_LICENSE as found in module.h ...
And here are the rules to set a MODULE_LICENSE and how this relates to
the top level SPDX-License-Identifier..."

BTW, I wished we could align the MODULE_LICENSE values with the SPDX
ids for clarity and as this would inject normalized SPDX license tags
in the Elf binaries.

But that 's likely impossible as it would break a truck load of
out-of-tree module macros and out-of-tree module loading command line
tools everywhere (such as busybox and many other) so the (computing)
world would crawl to a halt. *sigh*

-- 
Cordially
Philippe Ombredanne

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2017-11-18 10:30 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-17 14:18 [PATCH] media: usbvision: remove unneeded DRIVER_LICENSE #define Greg Kroah-Hartman
2017-11-17 14:32 ` Hans Verkuil
2017-11-17 14:52 ` Philippe Ombredanne
2017-11-17 14:58 ` Mauro Carvalho Chehab
2017-11-17 15:01   ` Philippe Ombredanne
2017-11-17 17:01     ` Mauro Carvalho Chehab
2017-11-17 17:15       ` Greg Kroah-Hartman
2017-11-17 15:38   ` Greg Kroah-Hartman
  -- strict thread matches above, loose matches on Subject: below --
2017-11-17 17:26 Philippe Ombredanne
2017-11-18 10:29 ` Greg Kroah-Hartman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox