Now that the SPDX tag is in all tty 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: Jiri Slaby <jslaby@xxxxxxxx> Cc: James Hogan <jhogan@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/tty/bfin_jtag_comm.c | 2 -- drivers/tty/ehv_bytechan.c | 4 ---- drivers/tty/goldfish.c | 10 ---------- drivers/tty/isicom.c | 5 ----- drivers/tty/metag_da.c | 5 ----- drivers/tty/mips_ejtag_fdc.c | 4 ---- drivers/tty/moxa.c | 5 ----- drivers/tty/mxser.c | 5 ----- drivers/tty/n_gsm.c | 13 ------------- drivers/tty/n_hdlc.c | 2 -- drivers/tty/n_null.c | 13 ------------- drivers/tty/n_r3964.c | 3 --- drivers/tty/n_tracerouter.c | 11 ----------- drivers/tty/n_tracesink.c | 11 ----------- drivers/tty/n_tracesink.h | 11 ----------- drivers/tty/n_tty.c | 3 --- drivers/tty/nozomi.c | 14 -------------- drivers/tty/rocket.c | 14 -------------- drivers/tty/synclink.c | 2 -- drivers/tty/synclink_gt.c | 2 -- drivers/tty/synclinkmp.c | 1 - drivers/tty/tty_audit.c | 5 +---- drivers/tty/tty_ldsem.c | 3 --- 23 files changed, 1 insertion(+), 147 deletions(-) diff --git a/drivers/tty/bfin_jtag_comm.c b/drivers/tty/bfin_jtag_comm.c index d569692b3bea..c369bf27a67b 100644 --- a/drivers/tty/bfin_jtag_comm.c +++ b/drivers/tty/bfin_jtag_comm.c @@ -5,8 +5,6 @@ * Copyright 2008-2009 Analog Devices Inc. * * Enter bugs at http://blackfin.uclinux.org/ - * - * Licensed under the GPL-2 or later. */ #define DRV_NAME "bfin-jtag-comm" diff --git a/drivers/tty/ehv_bytechan.c b/drivers/tty/ehv_bytechan.c index 9637f343deaf..e951e7a0737d 100644 --- a/drivers/tty/ehv_bytechan.c +++ b/drivers/tty/ehv_bytechan.c @@ -5,10 +5,6 @@ * * Author: Timur Tabi <timur@xxxxxxxxxxxxx> * - * This file is licensed under the terms of the GNU General Public License - * version 2. This program is licensed "as is" without any warranty of any - * kind, whether express or implied. - * * This driver support three distinct interfaces, all of which are related to * ePAPR hypervisor byte channels. * diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c index 061f10d71323..7f657bb5113c 100644 --- a/drivers/tty/goldfish.c +++ b/drivers/tty/goldfish.c @@ -3,16 +3,6 @@ * Copyright (C) 2007 Google, Inc. * Copyright (C) 2012 Intel, Inc. * Copyright (C) 2017 Imagination Technologies Ltd. - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * 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. - * */ #include <linux/console.h> diff --git a/drivers/tty/isicom.c b/drivers/tty/isicom.c index a598f79ee3fa..d666fb1e80f6 100644 --- a/drivers/tty/isicom.c +++ b/drivers/tty/isicom.c @@ -1,10 +1,5 @@ // SPDX-License-Identifier: GPL-2.0+ /* - * 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. - * * Original driver code supplied by Multi-Tech * * Changes diff --git a/drivers/tty/metag_da.c b/drivers/tty/metag_da.c index 6c804966e092..99eaed4b2dbc 100644 --- a/drivers/tty/metag_da.c +++ b/drivers/tty/metag_da.c @@ -3,11 +3,6 @@ * dashtty.c - tty driver for Dash channels interface. * * Copyright (C) 2007,2008,2012 Imagination Technologies - * - * 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/atomic.h> diff --git a/drivers/tty/mips_ejtag_fdc.c b/drivers/tty/mips_ejtag_fdc.c index f0a2f197c4db..4c1cd49ae95b 100644 --- a/drivers/tty/mips_ejtag_fdc.c +++ b/drivers/tty/mips_ejtag_fdc.c @@ -3,10 +3,6 @@ * TTY driver for MIPS EJTAG Fast Debug Channels. * * Copyright (C) 2007-2015 Imagination Technologies Ltd - * - * 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/atomic.h> diff --git a/drivers/tty/moxa.c b/drivers/tty/moxa.c index 8223960abb68..687c091bd066 100644 --- a/drivers/tty/moxa.c +++ b/drivers/tty/moxa.c @@ -8,11 +8,6 @@ * * This code is loosely based on the Linux serial driver, written by * Linus Torvalds, Theodore T'so and others. - * - * 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. */ /* diff --git a/drivers/tty/mxser.c b/drivers/tty/mxser.c index 4f4a54d16fc6..8bc15cb67a58 100644 --- a/drivers/tty/mxser.c +++ b/drivers/tty/mxser.c @@ -9,11 +9,6 @@ * Linux serial driver, written by Linus Torvalds, Theodore T'so and * others. * - * 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. - * * Fed through a cleanup, indent and remove of non 2.6 code by Alan Cox * <alan@xxxxxxxxxxxxxxxxxxx>. The original 1.8 code is available on * www.moxa.com. diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index df51d49f3dfb..3a39eb685c69 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -3,19 +3,6 @@ * n_gsm.c GSM 0710 tty multiplexor * Copyright (c) 2009/10 Intel Corporation * - * 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, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * * * THIS IS A DEVELOPMENT SNAPSHOT IT IS NOT A FINAL RELEASE * * * TO DO: diff --git a/drivers/tty/n_hdlc.c b/drivers/tty/n_hdlc.c index e2af7b1161f6..eea7b6cb3cc4 100644 --- a/drivers/tty/n_hdlc.c +++ b/drivers/tty/n_hdlc.c @@ -12,8 +12,6 @@ * * Original release 01/11/99 * - * This code is released under the GNU General Public License (GPL) - * * This module implements the tty line discipline N_HDLC for use with * tty device drivers that support bit-synchronous HDLC communications. * diff --git a/drivers/tty/n_null.c b/drivers/tty/n_null.c index cf6dc0fa401a..96feabae4740 100644 --- a/drivers/tty/n_null.c +++ b/drivers/tty/n_null.c @@ -8,19 +8,6 @@ * n_null.c - Null line discipline used in the failure path * * Copyright (C) Intel 2017 - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * - * 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. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ static int n_null_open(struct tty_struct *tty) diff --git a/drivers/tty/n_r3964.c b/drivers/tty/n_r3964.c index d18411500b1a..9f246d4db3ca 100644 --- a/drivers/tty/n_r3964.c +++ b/drivers/tty/n_r3964.c @@ -6,9 +6,6 @@ * Philips Automation Projects * Kassel (Germany) * ----------------------------------------------------------- - * This software may be used and distributed according to the terms of - * the GNU General Public License, incorporated herein by reference. - * * Author: * L. Haag * diff --git a/drivers/tty/n_tracerouter.c b/drivers/tty/n_tracerouter.c index 717d0c111b72..4479af4d2fa5 100644 --- a/drivers/tty/n_tracerouter.c +++ b/drivers/tty/n_tracerouter.c @@ -6,17 +6,6 @@ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - * 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. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * * This trace router uses the Linux line discipline framework to route * trace data coming from a HW Modem to a PTI (Parallel Trace Module) port. * The solution is not specific to a HW modem and this line disciple can diff --git a/drivers/tty/n_tracesink.c b/drivers/tty/n_tracesink.c index f90709495c2f..d96ba82cc356 100644 --- a/drivers/tty/n_tracesink.c +++ b/drivers/tty/n_tracesink.c @@ -6,17 +6,6 @@ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - * 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. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * * The trace sink uses the Linux line discipline framework to receive * trace data coming from the PTI source line discipline driver * to a user-desired tty port, like USB. diff --git a/drivers/tty/n_tracesink.h b/drivers/tty/n_tracesink.h index 2c9efd32f41b..1b846330c855 100644 --- a/drivers/tty/n_tracesink.h +++ b/drivers/tty/n_tracesink.h @@ -6,17 +6,6 @@ * * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * - * 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. - * - * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - * * The PTI (Parallel Trace Interface) driver directs trace data routed from * various parts in the system out through the Intel Penwell PTI port and * out of the mobile device for analysis with a debugging tool diff --git a/drivers/tty/n_tty.c b/drivers/tty/n_tty.c index 385b6a5161b2..427e0d5d8f13 100644 --- a/drivers/tty/n_tty.c +++ b/drivers/tty/n_tty.c @@ -16,9 +16,6 @@ * This file also contains code originally written by Linus Torvalds, * Copyright 1991, 1992, 1993, and by Julian Cowley, Copyright 1994. * - * This file may be redistributed under the terms of the GNU General Public - * License. - * * Reduced memory usage for older ARM systems - Russell King. * * 2000/01/20 Fixed SMP locking on put_tty_queue using bits of diff --git a/drivers/tty/nozomi.c b/drivers/tty/nozomi.c index ec3e1b26b616..b57b35066ebe 100644 --- a/drivers/tty/nozomi.c +++ b/drivers/tty/nozomi.c @@ -22,20 +22,6 @@ * Copyright (c) 2006 Option Wireless n/v * 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. 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., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * * -------------------------------------------------------------------------- */ diff --git a/drivers/tty/rocket.c b/drivers/tty/rocket.c index 59cd4b218218..375afc3e6850 100644 --- a/drivers/tty/rocket.c +++ b/drivers/tty/rocket.c @@ -5,20 +5,6 @@ * Written by Theodore Ts'o, 1995, 1996, 1997, 1998, 1999, 2000. * * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2003 by Comtrol, Inc. - * - * 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, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* diff --git a/drivers/tty/synclink.c b/drivers/tty/synclink.c index 15189ac3dcb8..f2c34d656144 100644 --- a/drivers/tty/synclink.c +++ b/drivers/tty/synclink.c @@ -14,8 +14,6 @@ * * Original release 01/11/99 * - * This code is released under the GNU General Public License (GPL) - * * This driver is primarily intended for use in synchronous * HDLC mode. Asynchronous mode is also provided. * diff --git a/drivers/tty/synclink_gt.c b/drivers/tty/synclink_gt.c index da9f2e56ee50..06a03731bba7 100644 --- a/drivers/tty/synclink_gt.c +++ b/drivers/tty/synclink_gt.c @@ -7,8 +7,6 @@ * * Microgate and SyncLink are trademarks of Microgate Corporation * - * This code is released under the GNU General Public License (GPL) - * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE diff --git a/drivers/tty/synclinkmp.c b/drivers/tty/synclinkmp.c index 4cc73be504e3..d45f234e1914 100644 --- a/drivers/tty/synclinkmp.c +++ b/drivers/tty/synclinkmp.c @@ -11,7 +11,6 @@ * Microgate and SyncLink are trademarks of Microgate Corporation * * Derived from serial.c written by Theodore Ts'o and Linus Torvalds - * This code is released under the GNU General Public License (GPL) * * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES diff --git a/drivers/tty/tty_audit.c b/drivers/tty/tty_audit.c index 30b92c461dea..e30aa6bf9ff9 100644 --- a/drivers/tty/tty_audit.c +++ b/drivers/tty/tty_audit.c @@ -2,10 +2,7 @@ /* * Creating audit events from TTY input. * - * Copyright (C) 2007 Red Hat, Inc. All rights reserved. This copyrighted - * material is made available to anyone wishing to use, modify, copy, or - * redistribute it subject to the terms and conditions of the GNU General - * Public License v.2. + * Copyright (C) 2007 Red Hat, Inc. All rights reserved. * * Authors: Miloslav Trmac <mitr@xxxxxxxxxx> */ diff --git a/drivers/tty/tty_ldsem.c b/drivers/tty/tty_ldsem.c index 3b403406d6f3..37a91b3df980 100644 --- a/drivers/tty/tty_ldsem.c +++ b/drivers/tty/tty_ldsem.c @@ -23,9 +23,6 @@ * Michel Lespinasse <walken@xxxxxxxxxx>. * * Copyright (C) 2013 Peter Hurley <peter@xxxxxxxxxxxxxxxxxx> - * - * This file may be redistributed under the terms of the GNU General Public - * License v2. */ #include <linux/list.h> -- 2.15.0 -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
