[PATCH 5/5] driver core: Remove redundant license text

From: Greg Kroah-Hartman
Date: Tue Nov 07 2017 - 11:30:32 EST

Next message: Greg Kroah-Hartman: "[PATCH 4/5] drivers: core: arch_topology.c: move SPDX tag to top of the file"
Previous message: Greg Kroah-Hartman: "[PATCH 3/5] driver core: add SPDX identifiers to all driver core files"
In reply to: Greg Kroah-Hartman: "[PATCH 3/5] driver core: add SPDX identifiers to all driver core files"
Next in thread: Greg Kroah-Hartman: "[PATCH 4/5] drivers: core: arch_topology.c: move SPDX tag to top of the file"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Now that the SPDX tag is in all driver core 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: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
Cc: "Luis R. Rodriguez" <mcgrof@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/base/attribute_container.c | 2 --
drivers/base/bus.c | 3 ---
drivers/base/cacheinfo.c | 12 ------------
drivers/base/class.c | 3 ---
drivers/base/component.c | 4 ----
drivers/base/container.c | 4 ----
drivers/base/core.c | 3 ---
drivers/base/dd.c | 2 --
drivers/base/devcoredump.c | 16 ----------------
drivers/base/devres.c | 2 --
drivers/base/dma-contiguous.c | 5 -----
drivers/base/dma-mapping.c | 2 --
drivers/base/driver.c | 3 ---
drivers/base/firmware.c | 2 --
drivers/base/hypervisor.c | 2 --
drivers/base/init.c | 2 --
drivers/base/map.c | 1 -
drivers/base/module.c | 3 ---
drivers/base/pinctrl.c | 2 --
drivers/base/platform-msi.c | 12 ------------
drivers/base/platform.c | 2 --
drivers/base/property.c | 4 ----
drivers/base/soc.c | 1 -
drivers/base/syscore.c | 2 --
drivers/base/test/test_async_driver_probe.c | 9 ---------
drivers/base/topology.c | 16 ----------------
drivers/base/transport_class.c | 2 --
include/linux/device.h | 2 --
28 files changed, 123 deletions(-)

diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index 218b9deb4f0b..20736aaa0e69 100644
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -4,8 +4,6 @@
*
* Copyright (c) 2005 - James Bottomley <James.Bottomley@xxxxxxxxxxxx>
*
- * This file is licensed under GPLv2
- *
* The basic idea here is to enable a device to be attached to an
* aritrary numer of classes without having to allocate storage for them.
* Instead, the contained classes select the devices they need to attach
diff --git a/drivers/base/bus.c b/drivers/base/bus.c
index 46ddb96b9179..6c63e1abbdcc 100644
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
@@ -6,9 +6,6 @@
* Copyright (c) 2002-3 Open Source Development Labs
* Copyright (c) 2007 Greg Kroah-Hartman <gregkh@xxxxxxx>
* Copyright (c) 2007 Novell Inc.
- *
- * This file is released under the GPLv2
- *
*/

#include <linux/async.h>
diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index e321a7e66a1d..6e1000bff481 100644
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -4,18 +4,6 @@
*
* Based on arch/x86/kernel/cpu/intel_cacheinfo.c
* Author: Sudeep Holla <sudeep.holla@xxxxxxx>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
- * kind, whether express or implied; 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/>.
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 61220ea83f8e..54def4e02f00 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -6,9 +6,6 @@
* Copyright (c) 2002-3 Open Source Development Labs
* Copyright (c) 2003-2004 Greg Kroah-Hartman
* Copyright (c) 2003-2004 IBM Corp.
- *
- * This file is released under the GPLv2
- *
*/

#include <linux/device.h>
diff --git a/drivers/base/component.c b/drivers/base/component.c
index c96ed8068719..891f0e38647c 100644
--- a/drivers/base/component.c
+++ b/drivers/base/component.c
@@ -2,10 +2,6 @@
/*
* Componentized device handling.
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
* This is work in progress. We gather up the component devices into a list,
* and bind them when instructed. At the moment, we're specific to the DRM
* subsystem, and only handles one master device, but this doesn't have to be
diff --git a/drivers/base/container.c b/drivers/base/container.c
index ddc68a1e10af..1ba42d2d3532 100644
--- a/drivers/base/container.c
+++ b/drivers/base/container.c
@@ -4,10 +4,6 @@
*
* Copyright (C) 2013, Intel Corporation
* Author: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
*/

#include <linux/container.h>
diff --git a/drivers/base/core.c b/drivers/base/core.c
index d9d1012e4979..c1cd857ea5ee 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -6,9 +6,6 @@
* Copyright (c) 2002-3 Open Source Development Labs
* Copyright (c) 2006 Greg Kroah-Hartman <gregkh@xxxxxxx>
* Copyright (c) 2006 Novell, Inc.
- *
- * This file is released under the GPLv2
- *
*/

#include <linux/device.h>
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index 5632382b1095..4a589c7b5b83 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c
@@ -14,8 +14,6 @@
* Copyright (c) 2002-3 Open Source Development Labs
* Copyright (c) 2007-2009 Greg Kroah-Hartman <gregkh@xxxxxxx>
* Copyright (c) 2007-2009 Novell Inc.
- *
- * This file is released under the GPLv2
*/

#include <linux/device.h>
diff --git a/drivers/base/devcoredump.c b/drivers/base/devcoredump.c
index 3133684a8754..f1a3353f3494 100644
--- a/drivers/base/devcoredump.c
+++ b/drivers/base/devcoredump.c
@@ -1,24 +1,8 @@
// SPDX-License-Identifier: GPL-2.0
/*
- * This file is provided under the GPLv2 license.
- *
- * GPL LICENSE SUMMARY
- *
* Copyright(c) 2014 Intel Mobile Communications GmbH
* Copyright(c) 2015 Intel Deutschland GmbH
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public License as
- * published by the Free Software Foundation.
- *
- * 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.
- *
- * The full GNU General Public License is included in this distribution
- * in the file called COPYING.
- *
* Contact Information:
* Intel Linux Wireless <ilw@xxxxxxxxxxxxxxx>
* Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
diff --git a/drivers/base/devres.c b/drivers/base/devres.c
index 1b7a9a8cbd6a..95b67281cd2a 100644
--- a/drivers/base/devres.c
+++ b/drivers/base/devres.c
@@ -4,8 +4,6 @@
*
* Copyright (c) 2006 SUSE Linux Products GmbH
* Copyright (c) 2006 Tejun Heo <teheo@xxxxxxx>
- *
- * This file is released under the GPLv2.
*/

#include <linux/device.h>
diff --git a/drivers/base/dma-contiguous.c b/drivers/base/dma-contiguous.c
index 7c954100d503..d987dcd1bd56 100644
--- a/drivers/base/dma-contiguous.c
+++ b/drivers/base/dma-contiguous.c
@@ -5,11 +5,6 @@
* Written by:
* Marek Szyprowski <m.szyprowski@xxxxxxxxxxx>
* Michal Nazarewicz <mina86@xxxxxxxxxx>
- *
- * 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 optional) any later version of the license.
*/

#define pr_fmt(fmt) "cma: " fmt
diff --git a/drivers/base/dma-mapping.c b/drivers/base/dma-mapping.c
index c7e7806a657f..3b118353ea17 100644
--- a/drivers/base/dma-mapping.c
+++ b/drivers/base/dma-mapping.c
@@ -4,8 +4,6 @@
*
* Copyright (c) 2006 SUSE Linux Products GmbH
* Copyright (c) 2006 Tejun Heo <teheo@xxxxxxx>
- *
- * This file is released under the GPLv2.
*/

#include <linux/acpi.h>
diff --git a/drivers/base/driver.c b/drivers/base/driver.c
index 6a93c7522dbe..4e20d68edb0d 100644
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
@@ -6,9 +6,6 @@
* Copyright (c) 2002-3 Open Source Development Labs
* Copyright (c) 2007 Greg Kroah-Hartman <gregkh@xxxxxxx>
* Copyright (c) 2007 Novell Inc.
- *
- * This file is released under the GPLv2
- *
*/

#include <linux/device.h>
diff --git a/drivers/base/firmware.c b/drivers/base/firmware.c
index 0ef2a36de65e..8dff940e0db9 100644
--- a/drivers/base/firmware.c
+++ b/drivers/base/firmware.c
@@ -6,8 +6,6 @@
* Copyright (c) 2002-3 Open Source Development Labs
* Copyright (c) 2007 Greg Kroah-Hartman <gregkh@xxxxxxx>
* Copyright (c) 2007 Novell Inc.
- *
- * This file is released under the GPLv2
*/
#include <linux/kobject.h>
#include <linux/module.h>
diff --git a/drivers/base/hypervisor.c b/drivers/base/hypervisor.c
index 8dbd98c7ed55..1ce59b4b53ce 100644
--- a/drivers/base/hypervisor.c
+++ b/drivers/base/hypervisor.c
@@ -5,8 +5,6 @@
* Copyright (C) IBM Corp. 2006
* Copyright (C) 2007 Greg Kroah-Hartman <gregkh@xxxxxxx>
* Copyright (C) 2007 Novell Inc.
- *
- * This file is released under the GPLv2
*/

#include <linux/kobject.h>
diff --git a/drivers/base/init.c b/drivers/base/init.c
index 0bf84b9e09b2..dd85b05a6a16 100644
--- a/drivers/base/init.c
+++ b/drivers/base/init.c
@@ -2,8 +2,6 @@
/*
* Copyright (c) 2002-3 Patrick Mochel
* Copyright (c) 2002-3 Open Source Development Labs
- *
- * This file is released under the GPLv2
*/

#include <linux/device.h>
diff --git a/drivers/base/map.c b/drivers/base/map.c
index 07daaf6c2cd6..5650ab2b247a 100644
--- a/drivers/base/map.c
+++ b/drivers/base/map.c
@@ -3,7 +3,6 @@
* linux/drivers/base/map.c
*
* (C) Copyright Al Viro 2002,2003
- * Released under GPL v2.
*
* NOTE: data structure needs to be changed. It works, but for large dev_t
* it will be too slow. It is isolated, though, so these changes will be
diff --git a/drivers/base/module.c b/drivers/base/module.c
index 9e50e55c547a..46ad4d636731 100644
--- a/drivers/base/module.c
+++ b/drivers/base/module.c
@@ -1,9 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/*
* module.c - module sysfs fun for drivers
- *
- * This file is released under the GPLv2
- *
*/
#include <linux/device.h>
#include <linux/module.h>
diff --git a/drivers/base/pinctrl.c b/drivers/base/pinctrl.c
index fec06a1a0e15..c22864458511 100644
--- a/drivers/base/pinctrl.c
+++ b/drivers/base/pinctrl.c
@@ -7,8 +7,6 @@
* Based on bits of regulator core, gpio core and clk core
*
* Author: Linus Walleij <linus.walleij@xxxxxxxxxx>
- *
- * License terms: GNU General Public License (GPL) version 2
*/

#include <linux/device.h>
diff --git a/drivers/base/platform-msi.c b/drivers/base/platform-msi.c
index d7c56d5b06e0..8e22073aeeed 100644
--- a/drivers/base/platform-msi.c
+++ b/drivers/base/platform-msi.c
@@ -4,18 +4,6 @@
*
* Copyright (C) 2015 ARM Limited, All Rights Reserved.
* Author: Marc Zyngier <marc.zyngier@xxxxxxx>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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/>.
*/

#include <linux/device.h>
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 99c21ba54d28..fa54265c2625 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -5,8 +5,6 @@
* Copyright (c) 2002-3 Patrick Mochel
* Copyright (c) 2002-3 Open Source Development Labs
*
- * This file is released under the GPLv2
- *
* Please see Documentation/driver-model/platform.txt for more
* information.
*/
diff --git a/drivers/base/property.c b/drivers/base/property.c
index f74ad3253a6c..3fefbb54ff89 100644
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -5,10 +5,6 @@
* Copyright (C) 2014, Intel Corporation
* Authors: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
* Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
*/

#include <linux/acpi.h>
diff --git a/drivers/base/soc.c b/drivers/base/soc.c
index b1e6e7ca46f0..4e80f48ad5d6 100644
--- a/drivers/base/soc.c
+++ b/drivers/base/soc.c
@@ -3,7 +3,6 @@
* Copyright (C) ST-Ericsson SA 2011
*
* Author: Lee Jones <lee.jones@xxxxxxxxxx> for ST-Ericsson.
- * License terms: GNU General Public License (GPL), version 2
*/

#include <linux/sysfs.h>
diff --git a/drivers/base/syscore.c b/drivers/base/syscore.c
index 34f71a46b51c..6e076f359dcc 100644
--- a/drivers/base/syscore.c
+++ b/drivers/base/syscore.c
@@ -3,8 +3,6 @@
* syscore.c - Execution of system core operations.
*
* Copyright (C) 2011 Rafael J. Wysocki <rjw@xxxxxxx>, Novell Inc.
- *
- * This file is released under the GPLv2.
*/

#include <linux/syscore_ops.h>
diff --git a/drivers/base/test/test_async_driver_probe.c b/drivers/base/test/test_async_driver_probe.c
index 58b445ed8d8b..e7f145d662f0 100644
--- a/drivers/base/test/test_async_driver_probe.c
+++ b/drivers/base/test/test_async_driver_probe.c
@@ -1,15 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Copyright (C) 2014 Google, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * 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.
*/

#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index 5abc176a2966..5fd9f167ecc1 100644
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -7,22 +7,6 @@
* Copyright (C) 2006, Intel Corp.
*
* All rights reserved.
- *
- * 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, GOOD TITLE or
- * NON INFRINGEMENT. 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, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
*/
#include <linux/mm.h>
#include <linux/cpu.h>
diff --git a/drivers/base/transport_class.c b/drivers/base/transport_class.c
index 750378341a43..5ed86ded6e6b 100644
--- a/drivers/base/transport_class.c
+++ b/drivers/base/transport_class.c
@@ -5,8 +5,6 @@
*
* Copyright (c) 2005 - James Bottomley <James.Bottomley@xxxxxxxxxxxx>
*
- * This file is licensed under GPLv2
- *
* The basic idea here is to allow any "device controller" (which
* would most often be a Host Bus Adapter to use the services of one
* or more tranport classes for performing transport specific
diff --git a/include/linux/device.h b/include/linux/device.h
index 6e6e8ed2bbb1..7db3a3046e7f 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -6,8 +6,6 @@
* Copyright (c) 2004-2009 Greg Kroah-Hartman <gregkh@xxxxxxx>
* Copyright (c) 2008-2009 Novell Inc.
*
- * This file is released under the GPLv2
- *
* See Documentation/driver-model/ for more information.
*/

--
2.15.0

Next message: Greg Kroah-Hartman: "[PATCH 4/5] drivers: core: arch_topology.c: move SPDX tag to top of the file"
Previous message: Greg Kroah-Hartman: "[PATCH 3/5] driver core: add SPDX identifiers to all driver core files"
In reply to: Greg Kroah-Hartman: "[PATCH 3/5] driver core: add SPDX identifiers to all driver core files"
Next in thread: Greg Kroah-Hartman: "[PATCH 4/5] drivers: core: arch_topology.c: move SPDX tag to top of the file"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]