summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-11-14 12:38:08 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2017-11-24 08:28:47 -0500
commit13d1d559f04a893b4a32ec04fb9d7210ec4d9597 (patch)
tree8763a6e611aeb631909cff66875ad7e57860f84a
parent0b622e60bc6c4eca75d517b10f15914ecd58e6b1 (diff)
s390: drivers: Remove redundant license text
Now that the SPDX tag is in all drivers/s390/ 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: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Sebastian Ott <sebott@linux.vnet.ibm.com> Cc: Peter Oberparleiter <oberpar@linux.vnet.ibm.com> Cc: Julian Wiedmann <jwi@linux.vnet.ibm.com> Cc: Ursula Braun <ubraun@linux.vnet.ibm.com> Cc: Cornelia Huck <cohuck@redhat.com> Cc: Halil Pasic <pasic@linux.vnet.ibm.com> Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--drivers/s390/char/zcore.c1
-rw-r--r--drivers/s390/cio/cmf.c14
-rw-r--r--drivers/s390/cio/css.c2
-rw-r--r--drivers/s390/cio/device.c2
-rw-r--r--drivers/s390/cio/device_ops.c2
-rw-r--r--drivers/s390/net/lcs.c14
-rw-r--r--drivers/s390/net/netiucv.c15
-rw-r--r--drivers/s390/net/smsgiucv.c14
-rw-r--r--drivers/s390/virtio/Makefile4
-rw-r--r--drivers/s390/virtio/virtio_ccw.c4
10 files changed, 0 insertions, 72 deletions
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c
index dd86559ce7fb..4369662cfff5 100644
--- a/drivers/s390/char/zcore.c
+++ b/drivers/s390/char/zcore.c
@@ -8,7 +8,6 @@
8 * 8 *
9 * Copyright IBM Corp. 2003, 2008 9 * Copyright IBM Corp. 2003, 2008
10 * Author(s): Michael Holzheu 10 * Author(s): Michael Holzheu
11 * License: GPL
12 */ 11 */
13 12
14#define KMSG_COMPONENT "zdump" 13#define KMSG_COMPONENT "zdump"
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index 320ce009ba41..5e495c62cfa7 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -8,20 +8,6 @@
8 * Cornelia Huck <cornelia.huck@de.ibm.com> 8 * Cornelia Huck <cornelia.huck@de.ibm.com>
9 * 9 *
10 * original idea from Natarajan Krishnaswami <nkrishna@us.ibm.com> 10 * original idea from Natarajan Krishnaswami <nkrishna@us.ibm.com>
11 *
12 * This program is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License as published by
14 * the Free Software Foundation; either version 2, or (at your option)
15 * any later version.
16 *
17 * This program is distributed in the hope that it will be useful,
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 * GNU General Public License for more details.
21 *
22 * You should have received a copy of the GNU General Public License
23 * along with this program; if not, write to the Free Software
24 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 */ 11 */
26 12
27#define KMSG_COMPONENT "cio" 13#define KMSG_COMPONENT "cio"
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index f4c2e71e7a56..0f11dce6e224 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -6,8 +6,6 @@
6 * 6 *
7 * Author(s): Arnd Bergmann (arndb@de.ibm.com) 7 * Author(s): Arnd Bergmann (arndb@de.ibm.com)
8 * Cornelia Huck (cornelia.huck@de.ibm.com) 8 * Cornelia Huck (cornelia.huck@de.ibm.com)
9 *
10 * License: GPL
11 */ 9 */
12 10
13#define KMSG_COMPONENT "cio" 11#define KMSG_COMPONENT "cio"
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index e4ed6c651bca..75a245f38e2e 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -6,8 +6,6 @@
6 * Author(s): Arnd Bergmann (arndb@de.ibm.com) 6 * Author(s): Arnd Bergmann (arndb@de.ibm.com)
7 * Cornelia Huck (cornelia.huck@de.ibm.com) 7 * Cornelia Huck (cornelia.huck@de.ibm.com)
8 * Martin Schwidefsky (schwidefsky@de.ibm.com) 8 * Martin Schwidefsky (schwidefsky@de.ibm.com)
9 *
10 * License: GPL
11 */ 9 */
12 10
13#define KMSG_COMPONENT "cio" 11#define KMSG_COMPONENT "cio"
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c
index aa125d92cc65..1caf6a398760 100644
--- a/drivers/s390/cio/device_ops.c
+++ b/drivers/s390/cio/device_ops.c
@@ -4,8 +4,6 @@
4 * 4 *
5 * Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com) 5 * Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
6 * Cornelia Huck (cornelia.huck@de.ibm.com) 6 * Cornelia Huck (cornelia.huck@de.ibm.com)
7 *
8 * License: GPL
9 */ 7 */
10#include <linux/export.h> 8#include <linux/export.h>
11#include <linux/init.h> 9#include <linux/init.h>
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c
index 36899e94d268..92ae84a927fc 100644
--- a/drivers/s390/net/lcs.c
+++ b/drivers/s390/net/lcs.c
@@ -8,20 +8,6 @@
8 * Rewritten by 8 * Rewritten by
9 * Frank Pavlic <fpavlic@de.ibm.com> and 9 * Frank Pavlic <fpavlic@de.ibm.com> and
10 * Martin Schwidefsky <schwidefsky@de.ibm.com> 10 * Martin Schwidefsky <schwidefsky@de.ibm.com>
11 *
12 * This program is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License as published by
14 * the Free Software Foundation; either version 2, or (at your option)
15 * any later version.
16 *
17 * This program is distributed in the hope that it will be useful,
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 * GNU General Public License for more details.
21 *
22 * You should have received a copy of the GNU General Public License
23 * along with this program; if not, write to the Free Software
24 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 */ 11 */
26 12
27#define KMSG_COMPONENT "lcs" 13#define KMSG_COMPONENT "lcs"
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c
index 150053131baf..5ce2424ca729 100644
--- a/drivers/s390/net/netiucv.c
+++ b/drivers/s390/net/netiucv.c
@@ -19,21 +19,6 @@
19 * Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com) 19 * Denis Joseph Barrow (djbarrow@de.ibm.com,barrow_dj@yahoo.com)
20 * Martin Schwidefsky (schwidefsky@de.ibm.com) 20 * Martin Schwidefsky (schwidefsky@de.ibm.com)
21 * Alan Altmark (Alan_Altmark@us.ibm.com) Sept. 2000 21 * Alan Altmark (Alan_Altmark@us.ibm.com) Sept. 2000
22 *
23 * This program is free software; you can redistribute it and/or modify
24 * it under the terms of the GNU General Public License as published by
25 * the Free Software Foundation; either version 2, or (at your option)
26 * any later version.
27 *
28 * This program is distributed in the hope that it will be useful,
29 * but WITHOUT ANY WARRANTY; without even the implied warranty of
30 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
31 * GNU General Public License for more details.
32 *
33 * You should have received a copy of the GNU General Public License
34 * along with this program; if not, write to the Free Software
35 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
36 *
37 */ 22 */
38 23
39#define KMSG_COMPONENT "netiucv" 24#define KMSG_COMPONENT "netiucv"
diff --git a/drivers/s390/net/smsgiucv.c b/drivers/s390/net/smsgiucv.c
index 93405e0bad3c..3b0c8b8a7634 100644
--- a/drivers/s390/net/smsgiucv.c
+++ b/drivers/s390/net/smsgiucv.c
@@ -5,20 +5,6 @@
5 * Copyright IBM Corp. 2003, 2009 5 * Copyright IBM Corp. 2003, 2009
6 * 6 *
7 * Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com) 7 * Author(s): Martin Schwidefsky (schwidefsky@de.ibm.com)
8 *
9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 2, or (at your option)
12 * any later version.
13 *
14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 */ 8 */
23 9
24#include <linux/module.h> 10#include <linux/module.h>
diff --git a/drivers/s390/virtio/Makefile b/drivers/s390/virtio/Makefile
index 7c6f0c8db883..2dc4d9aab634 100644
--- a/drivers/s390/virtio/Makefile
+++ b/drivers/s390/virtio/Makefile
@@ -2,9 +2,5 @@
2# Makefile for kvm guest drivers on s390 2# Makefile for kvm guest drivers on s390
3# 3#
4# Copyright IBM Corp. 2008 4# Copyright IBM Corp. 2008
5#
6# This program is free software; you can redistribute it and/or modify
7# it under the terms of the GNU General Public License (version 2 only)
8# as published by the Free Software Foundation.
9 5
10obj-$(CONFIG_S390_GUEST) += virtio_ccw.o 6obj-$(CONFIG_S390_GUEST) += virtio_ccw.o
diff --git a/drivers/s390/virtio/virtio_ccw.c b/drivers/s390/virtio/virtio_ccw.c
index 56346caadb21..ba2e0856d22c 100644
--- a/drivers/s390/virtio/virtio_ccw.c
+++ b/drivers/s390/virtio/virtio_ccw.c
@@ -4,10 +4,6 @@
4 * 4 *
5 * Copyright IBM Corp. 2012, 2014 5 * Copyright IBM Corp. 2012, 2014
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify
8 * it under the terms of the GNU General Public License (version 2 only)
9 * as published by the Free Software Foundation.
10 *
11 * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com> 7 * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
12 */ 8 */
13 9