From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965442AbdKQPiV (ORCPT ); Fri, 17 Nov 2017 10:38:21 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:41814 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965319AbdKQPiO (ORCPT ); Fri, 17 Nov 2017 10:38:14 -0500 Date: Fri, 17 Nov 2017 16:38:18 +0100 From: Greg Kroah-Hartman To: Mauro Carvalho Chehab Cc: Hans Verkuil , Mauro Carvalho Chehab , Johan Hovold , Davidlohr Bueso , Sakari Ailus , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Philippe Ombredanne Subject: Re: [PATCH] media: usbvision: remove unneeded DRIVER_LICENSE #define Message-ID: <20171117153818.GA12642@kroah.com> References: <20171117141826.GC17880@kroah.com> <20171117125847.28004106@vento.lan> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171117125847.28004106@vento.lan> User-Agent: Mutt/1.9.1 (2017-09-22) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 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 > > --- > > 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