On Mon, Nov 06, 2017 at 03:37:18PM +0100, Greg Kroah-Hartman wrote: > Now that the SPDX tag is in all USB 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: Peter Chen <Peter.Chen@xxxxxxx> > Cc: Thierry Reding <thierry.reding@xxxxxxxxx> > Cc: Jonathan Hunter <jonathanh@xxxxxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Acked-by: Peter Chen <peter.chen@xxxxxxx> > --- > drivers/usb/chipidea/bits.h | 4 ---- > drivers/usb/chipidea/ci.h | 4 ---- > drivers/usb/chipidea/ci_hdrc_imx.c | 7 ------- > drivers/usb/chipidea/ci_hdrc_imx.h | 7 ------- > drivers/usb/chipidea/ci_hdrc_msm.c | 7 +------ > drivers/usb/chipidea/ci_hdrc_pci.c | 4 ---- > drivers/usb/chipidea/ci_hdrc_tegra.c | 4 ---- > drivers/usb/chipidea/ci_hdrc_usb2.c | 4 ---- > drivers/usb/chipidea/ci_hdrc_zevio.c | 5 ----- > drivers/usb/chipidea/core.c | 4 ---- > drivers/usb/chipidea/host.c | 13 ------------- > drivers/usb/chipidea/otg.c | 4 ---- > drivers/usb/chipidea/otg.h | 4 ---- > drivers/usb/chipidea/otg_fsm.c | 4 ---- > drivers/usb/chipidea/otg_fsm.h | 4 ---- > drivers/usb/chipidea/udc.c | 4 ---- > drivers/usb/chipidea/udc.h | 4 ---- > drivers/usb/chipidea/ulpi.c | 9 --------- > drivers/usb/chipidea/usbmisc_imx.c | 7 ------- > 19 files changed, 1 insertion(+), 102 deletions(-) > > diff --git a/drivers/usb/chipidea/bits.h b/drivers/usb/chipidea/bits.h > index 018a28e2e7d8..98da99510be7 100644 > --- a/drivers/usb/chipidea/bits.h > +++ b/drivers/usb/chipidea/bits.h > @@ -5,10 +5,6 @@ > * Copyright (C) 2008 Chipidea - MIPS Technologies, Inc. All rights reserved. > * > * Author: David Lopo > - * > - * 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. > */ > > #ifndef __DRIVERS_USB_CHIPIDEA_BITS_H > diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h > index fa6dd9d9f5c6..98b7cb3d0064 100644 > --- a/drivers/usb/chipidea/ci.h > +++ b/drivers/usb/chipidea/ci.h > @@ -5,10 +5,6 @@ > * Copyright (C) 2008 Chipidea - MIPS Technologies, Inc. All rights reserved. > * > * Author: David Lopo > - * > - * 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. > */ > > #ifndef __DRIVERS_USB_CHIPIDEA_CI_H > diff --git a/drivers/usb/chipidea/ci_hdrc_imx.c b/drivers/usb/chipidea/ci_hdrc_imx.c > index 9a2f7416ff9e..3b45c25f296e 100644 > --- a/drivers/usb/chipidea/ci_hdrc_imx.c > +++ b/drivers/usb/chipidea/ci_hdrc_imx.c > @@ -3,13 +3,6 @@ > * Copyright 2012 Freescale Semiconductor, Inc. > * Copyright (C) 2012 Marek Vasut <marex@xxxxxxx> > * on behalf of DENX Software Engineering GmbH > - * > - * The code contained herein is licensed under the GNU General Public > - * License. You may obtain a copy of the GNU General Public License > - * Version 2 or later at the following locations: > - * > - * http://www.opensource.org/licenses/gpl-license.html > - * http://www.gnu.org/copyleft/gpl.html > */ > > #include <linux/module.h> > diff --git a/drivers/usb/chipidea/ci_hdrc_imx.h b/drivers/usb/chipidea/ci_hdrc_imx.h > index 98a8b8c817ff..204275f47573 100644 > --- a/drivers/usb/chipidea/ci_hdrc_imx.h > +++ b/drivers/usb/chipidea/ci_hdrc_imx.h > @@ -1,13 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0+ > /* > * Copyright 2012 Freescale Semiconductor, Inc. > - * > - * The code contained herein is licensed under the GNU General Public > - * License. You may obtain a copy of the GNU General Public License > - * Version 2 or later at the following locations: > - * > - * http://www.opensource.org/licenses/gpl-license.html > - * http://www.gnu.org/copyleft/gpl.html > */ > > #ifndef __DRIVER_USB_CHIPIDEA_CI_HDRC_IMX_H > diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c > index 85aac4e881aa..3593ce0ec641 100644 > --- a/drivers/usb/chipidea/ci_hdrc_msm.c > +++ b/drivers/usb/chipidea/ci_hdrc_msm.c > @@ -1,10 +1,5 @@ > // SPDX-License-Identifier: GPL-2.0 > -/* Copyright (c) 2010, Code Aurora Forum. 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 version 2 and > - * only version 2 as published by the Free Software Foundation. > - */ > +/* Copyright (c) 2010, Code Aurora Forum. All rights reserved. */ > > #include <linux/module.h> > #include <linux/platform_device.h> > diff --git a/drivers/usb/chipidea/ci_hdrc_pci.c b/drivers/usb/chipidea/ci_hdrc_pci.c > index a9dd661026bf..49a61549cee6 100644 > --- a/drivers/usb/chipidea/ci_hdrc_pci.c > +++ b/drivers/usb/chipidea/ci_hdrc_pci.c > @@ -5,10 +5,6 @@ > * Copyright (C) 2008 Chipidea - MIPS Technologies, Inc. All rights reserved. > * > * Author: David Lopo > - * > - * 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/platform_device.h> > diff --git a/drivers/usb/chipidea/ci_hdrc_tegra.c b/drivers/usb/chipidea/ci_hdrc_tegra.c > index bfcee2702d50..d9a5c8d2ba19 100644 > --- a/drivers/usb/chipidea/ci_hdrc_tegra.c > +++ b/drivers/usb/chipidea/ci_hdrc_tegra.c > @@ -1,9 +1,5 @@ > /* > * Copyright (c) 2016, NVIDIA Corporation > - * > - * This program is free software; you can redistribute it and/or modify it > - * under the terms and conditions of the GNU General Public License, > - * version 2, as published by the Free Software Foundation. > */ > > #include <linux/clk.h> > diff --git a/drivers/usb/chipidea/ci_hdrc_usb2.c b/drivers/usb/chipidea/ci_hdrc_usb2.c > index 41c5f8b9c0b9..c044fba463e4 100644 > --- a/drivers/usb/chipidea/ci_hdrc_usb2.c > +++ b/drivers/usb/chipidea/ci_hdrc_usb2.c > @@ -3,10 +3,6 @@ > * Copyright (C) 2014 Marvell Technology Group Ltd. > * > * Antoine Tenart <antoine.tenart@xxxxxxxxxxxxxxxxxx> > - * > - * 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. > */ > > #include <linux/clk.h> > diff --git a/drivers/usb/chipidea/ci_hdrc_zevio.c b/drivers/usb/chipidea/ci_hdrc_zevio.c > index b8c75304d805..e1634da4a4b1 100644 > --- a/drivers/usb/chipidea/ci_hdrc_zevio.c > +++ b/drivers/usb/chipidea/ci_hdrc_zevio.c > @@ -2,12 +2,7 @@ > /* > * Copyright (C) 2013 Daniel Tang <tangrs@xxxxxxxxxxxx> > * > - * 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. > - * > * Based off drivers/usb/chipidea/ci_hdrc_msm.c > - * > */ > > #include <linux/module.h> > diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c > index 708c2eaba81c..dd2dd9391bb7 100644 > --- a/drivers/usb/chipidea/core.c > +++ b/drivers/usb/chipidea/core.c > @@ -5,10 +5,6 @@ > * Copyright (C) 2008 Chipidea - MIPS Technologies, Inc. All rights reserved. > * > * Author: David Lopo > - * > - * 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. > */ > > /* > diff --git a/drivers/usb/chipidea/host.c b/drivers/usb/chipidea/host.c > index a49e8567ac7d..19d60ed7e41f 100644 > --- a/drivers/usb/chipidea/host.c > +++ b/drivers/usb/chipidea/host.c > @@ -5,19 +5,6 @@ > * Copyright (c) 2012 Intel Corporation > * > * Author: Alexander Shishkin > - * > - * 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. > */ > > #include <linux/kernel.h> > diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c > index ef22fcc63f33..db4ceffcf2a6 100644 > --- a/drivers/usb/chipidea/otg.c > +++ b/drivers/usb/chipidea/otg.c > @@ -5,10 +5,6 @@ > * Copyright (C) 2013 Freescale Semiconductor, Inc. > * > * Author: Peter Chen > - * > - * 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. > */ > > /* > diff --git a/drivers/usb/chipidea/otg.h b/drivers/usb/chipidea/otg.h > index b8e2415bfa7c..7e7428e48bfa 100644 > --- a/drivers/usb/chipidea/otg.h > +++ b/drivers/usb/chipidea/otg.h > @@ -3,10 +3,6 @@ > * Copyright (C) 2013-2014 Freescale Semiconductor, Inc. > * > * Author: Peter Chen > - * > - * 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. > */ > > #ifndef __DRIVERS_USB_CHIPIDEA_OTG_H > diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c > index 485aaa1747e8..9e2d300060bc 100644 > --- a/drivers/usb/chipidea/otg_fsm.c > +++ b/drivers/usb/chipidea/otg_fsm.c > @@ -5,10 +5,6 @@ > * Copyright (C) 2014 Freescale Semiconductor, Inc. > * > * Author: Jun Li > - * > - * 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. > */ > > /* > diff --git a/drivers/usb/chipidea/otg_fsm.h b/drivers/usb/chipidea/otg_fsm.h > index 08e74aeea21d..2b49d29bf2fb 100644 > --- a/drivers/usb/chipidea/otg_fsm.h > +++ b/drivers/usb/chipidea/otg_fsm.h > @@ -3,10 +3,6 @@ > * Copyright (C) 2014 Freescale Semiconductor, Inc. > * > * Author: Jun Li > - * > - * 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. > */ > > #ifndef __DRIVERS_USB_CHIPIDEA_OTG_FSM_H > diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c > index 9e75e0921b3f..9852ec5e6e01 100644 > --- a/drivers/usb/chipidea/udc.c > +++ b/drivers/usb/chipidea/udc.c > @@ -5,10 +5,6 @@ > * Copyright (C) 2008 Chipidea - MIPS Technologies, Inc. All rights reserved. > * > * Author: David Lopo > - * > - * 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/delay.h> > diff --git a/drivers/usb/chipidea/udc.h b/drivers/usb/chipidea/udc.h > index 840275342873..e023735d94b7 100644 > --- a/drivers/usb/chipidea/udc.h > +++ b/drivers/usb/chipidea/udc.h > @@ -5,10 +5,6 @@ > * Copyright (C) 2008 Chipidea - MIPS Technologies, Inc. All rights reserved. > * > * Author: David Lopo > - * > - * 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. > */ > > #ifndef __DRIVERS_USB_CHIPIDEA_UDC_H > diff --git a/drivers/usb/chipidea/ulpi.c b/drivers/usb/chipidea/ulpi.c > index c4e1900b9777..6da42dcd2888 100644 > --- a/drivers/usb/chipidea/ulpi.c > +++ b/drivers/usb/chipidea/ulpi.c > @@ -1,15 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0 > /* > * Copyright (c) 2016 Linaro 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/device.h> > diff --git a/drivers/usb/chipidea/usbmisc_imx.c b/drivers/usb/chipidea/usbmisc_imx.c > index e3842238adeb..8cdf0af156c6 100644 > --- a/drivers/usb/chipidea/usbmisc_imx.c > +++ b/drivers/usb/chipidea/usbmisc_imx.c > @@ -1,13 +1,6 @@ > // SPDX-License-Identifier: GPL-2.0+ > /* > * Copyright 2012 Freescale Semiconductor, Inc. > - * > - * The code contained herein is licensed under the GNU General Public > - * License. You may obtain a copy of the GNU General Public License > - * Version 2 or later at the following locations: > - * > - * http://www.opensource.org/licenses/gpl-license.html > - * http://www.gnu.org/copyleft/gpl.html > */ > > #include <linux/module.h> > -- > 2.15.0 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-usb" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- Best Regards, Peter Chen -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
