[PATCH 12/24] staging: nvec: remove redundant license text

Greg Kroah-Hartman gregkh at linuxfoundation.org
Thu Jan 11 10:08:43 UTC 2018


Now that the SPDX tag is in all drivers/staging/nvec/ files, that
identifies the license in a specific and legally-defined manner.  So the
extra GPL text wording can be removed as it is no longer needed at all.

This is done on a quest to remove the 700+ different ways that files in
the kernel describe the GPL license text.  And there's unneeded stuff
like the address (sometimes incorrect) for the FSF which is never
needed.

No copyright headers or other non-license-description text was removed.

Cc: Marc Dietrich <marvin24 at gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
---
 drivers/staging/nvec/nvec-keytable.h | 13 -------------
 drivers/staging/nvec/nvec.c          |  5 -----
 drivers/staging/nvec/nvec.h          |  5 -----
 drivers/staging/nvec/nvec_kbd.c      |  5 -----
 drivers/staging/nvec/nvec_paz00.c    |  5 -----
 drivers/staging/nvec/nvec_power.c    |  5 -----
 drivers/staging/nvec/nvec_ps2.c      |  5 -----
 7 files changed, 43 deletions(-)

diff --git a/drivers/staging/nvec/nvec-keytable.h b/drivers/staging/nvec/nvec-keytable.h
index fb1b15365c1e..ac58e87e6a4e 100644
--- a/drivers/staging/nvec/nvec-keytable.h
+++ b/drivers/staging/nvec/nvec-keytable.h
@@ -6,19 +6,6 @@
  * embedded controller
  *
  * Copyright (c) 2009, NVIDIA Corporation.
- *
- * 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.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, see http://www.gnu.org/licenses
  */
 
 static unsigned short code_tab_102us[] = {
diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
index 55d71e768067..52054a528723 100644
--- a/drivers/staging/nvec/nvec.c
+++ b/drivers/staging/nvec/nvec.c
@@ -8,11 +8,6 @@
  *           Ilya Petrov <ilya.muromec at gmail.com>
  *           Marc Dietrich <marvin24 at gmx.de>
  *           Julian Andres Klode <jak at jak-linux.org>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
  */
 
 #include <linux/kernel.h>
diff --git a/drivers/staging/nvec/nvec.h b/drivers/staging/nvec/nvec.h
index e8e952612604..25efcdfa4f20 100644
--- a/drivers/staging/nvec/nvec.h
+++ b/drivers/staging/nvec/nvec.h
@@ -8,11 +8,6 @@
  *           Ilya Petrov <ilya.muromec at gmail.com>
  *           Marc Dietrich <marvin24 at gmx.de>
  *           Julian Andres Klode <jak at jak-linux.org>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
  */
 
 #ifndef __LINUX_MFD_NVEC
diff --git a/drivers/staging/nvec/nvec_kbd.c b/drivers/staging/nvec/nvec_kbd.c
index fe17515a2f23..01dbb66f7e9a 100644
--- a/drivers/staging/nvec/nvec_kbd.c
+++ b/drivers/staging/nvec/nvec_kbd.c
@@ -6,11 +6,6 @@
  *
  * Authors:  Pierre-Hugues Husson <phhusson at free.fr>
  *           Marc Dietrich <marvin24 at gmx.de>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
  */
 
 #include <linux/module.h>
diff --git a/drivers/staging/nvec/nvec_paz00.c b/drivers/staging/nvec/nvec_paz00.c
index 33e8922b550d..8b4da95081c8 100644
--- a/drivers/staging/nvec/nvec_paz00.c
+++ b/drivers/staging/nvec/nvec_paz00.c
@@ -5,11 +5,6 @@
  * Copyright (C) 2011 The AC100 Kernel Team <ac100 at lists.launchpad.net>
  *
  * Authors:  Ilya Petrov <ilya.muromec at gmail.com>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
  */
 
 #include <linux/module.h>
diff --git a/drivers/staging/nvec/nvec_power.c b/drivers/staging/nvec/nvec_power.c
index 94ac2c2def0a..0e861c4bfcbf 100644
--- a/drivers/staging/nvec/nvec_power.c
+++ b/drivers/staging/nvec/nvec_power.c
@@ -6,11 +6,6 @@
  *
  * Authors:  Ilya Petrov <ilya.muromec at gmail.com>
  *           Marc Dietrich <marvin24 at gmx.de>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
  */
 
 #include <linux/module.h>
diff --git a/drivers/staging/nvec/nvec_ps2.c b/drivers/staging/nvec/nvec_ps2.c
index 58f93b85ae1d..45db29262a9c 100644
--- a/drivers/staging/nvec/nvec_ps2.c
+++ b/drivers/staging/nvec/nvec_ps2.c
@@ -7,11 +7,6 @@
  * Authors:  Pierre-Hugues Husson <phhusson at free.fr>
  *           Ilya Petrov <ilya.muromec at gmail.com>
  *           Marc Dietrich <marvin24 at gmx.de>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- *
  */
 
 #include <linux/module.h>
-- 
2.15.1



More information about the devel mailing list