From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759406AbdKQRB0 (ORCPT ); Fri, 17 Nov 2017 12:01:26 -0500 Received: from osg.samsung.com ([64.30.133.232]:43883 "EHLO osg.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751425AbdKQRBT (ORCPT ); Fri, 17 Nov 2017 12:01:19 -0500 Date: Fri, 17 Nov 2017 15:01:02 -0200 From: Mauro Carvalho Chehab To: Philippe Ombredanne Cc: Greg Kroah-Hartman , Hans Verkuil , Mauro Carvalho Chehab , Johan Hovold , Davidlohr Bueso , Sakari Ailus , Linux Media Mailing List , LKML Subject: Re: [PATCH] media: usbvision: remove unneeded DRIVER_LICENSE #define Message-ID: <20171117150102.1f5faeda@vento.lan> In-Reply-To: References: <20171117141826.GC17880@kroah.com> <20171117125847.28004106@vento.lan> Organization: Samsung X-Mailer: Claws Mail 3.15.1-dirty (GTK+ 2.24.31; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Fri, 17 Nov 2017 16:01:41 +0100 Philippe Ombredanne escreveu: > On Fri, Nov 17, 2017 at 3:58 PM, Mauro Carvalho Chehab > wrote: > > Em Fri, 17 Nov 2017 15:18:26 +0100 > > Greg Kroah-Hartman 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 > >> Cc: Mauro Carvalho Chehab > >> Cc: Johan Hovold > >> Cc: Davidlohr Bueso > >> Cc: Sakari Ailus > >> Reported-by: Philippe Ombredanne > >> Signed-off-by: Greg Kroah-Hartman Acked-by: Mauro Carvalho Chehab > >> --- > >> 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. Thanks, Mauro